X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=install.sh;h=31420abacc51da67aa7c800985151f1c87546e5c;hb=e4f35679a9f4c98a2f5450c593d58a19d34e5408;hp=c12763f2ac3901fd82457ea82a0d183ecdc6c4eb;hpb=09938a16127372eb24493e4bceb5dffe9e23a76d;p=deliverable%2Fbinutils-gdb.git

diff --git a/install.sh b/install.sh
index c12763f2ac..31420abacc 100755
--- a/install.sh
+++ b/install.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
-set -e
-
 #
 # install - install a program, script, or datafile
-# This comes from X11R5; it is not part of GNU.
+# This comes from X11R5.
 #
 # $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
 #
@@ -32,7 +30,7 @@ mkdirprog="${MKDIRPROG-mkdir}"
 tranformbasename=""
 transform_arg=""
 instcmd="$mvprog"
-chmodcmd=""
+chmodcmd="$chmodprog 0755"
 chowncmd=""
 chgrpcmd=""
 stripcmd=""
@@ -40,6 +38,7 @@ rmcmd="$rmprog -f"
 mvcmd="$mvprog"
 src=""
 dst=""
+dir_arg=""
 
 while [ x"$1" != x ]; do
     case $1 in
@@ -47,6 +46,10 @@ while [ x"$1" != x ]; do
 	    shift
 	    continue;;
 
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
 	-m) chmodcmd="$chmodprog $2"
 	    shift
 	    shift
@@ -78,6 +81,8 @@ while [ x"$1" != x ]; do
 	    then
 		src=$1
 	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
 		dst=$1
 	    fi
 	    shift
@@ -93,33 +98,56 @@ else
 	true
 fi
 
-if [ x"$dst" = x ]
-then
-	echo "install:	no destination specified"
-	exit 1
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+	else
+		instcmd=mkdir
+	fi
 else
-	true
-fi
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
 
 # If destination is a directory, append the input filename; if your system
 # does not like double slashes in filenames, you may need to add some logic
 
-if [ -d $dst ]
-then
-	dst="$dst"/`basename $src`
-else
-	true
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
 fi
 
-
-# Make a temp file name in the proper directory.
-
-dstdir=`dirname $dst`
-dsttmp=$dstdir/#inst.$$#
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Make sure that the destination directory exists.
 #  this part is taken from Noah Friedman's mkinstalldirs script
 
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
 defaultIFS='	
 '
 IFS="${IFS-${defaultIFS}}"
@@ -145,40 +173,64 @@ while [ $# -ne 0 ] ; do
 
 	pathcomp="${pathcomp}/"
 done
+fi
 
-# If we're going to rename the final executable, determine the name now.
-
-if [ x"$transformarg" = x ] 
+if [ x"$dir_arg" != x ]
 then
-	dstfile=`basename $dst`
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
 else
-	dstfile=`basename $dst $transformbasename | sed $transformarg`
-fi
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
 
 # don't allow the sed command to completely eliminate the filename
 
-if [ x"$dstfile" = x ] 
-then
-	dstfile=`basename $dst`
-else
-	true
-fi
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
 
 # Move or copy the file name to the temp name
 
-$doit $instcmd $src $dsttmp
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
 
 # and set any options; do chmod last to preserve setuid bits
 
-if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
-if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
-if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
-if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
 
 # Now rename the file to the real destination.
 
-$doit $rmcmd $dstdir/$dstfile
-$doit $mvcmd $dsttmp $dstdir/$dstfile
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
 
 
 exit 0