diff options
Diffstat (limited to 'Templates')
| -rwxr-xr-x | Templates/install-sh | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/Templates/install-sh b/Templates/install-sh index e9de238..f90a48c 100755 --- a/Templates/install-sh +++ b/Templates/install-sh @@ -113,10 +113,10 @@ else fi if [ x"$dir_arg" != x ]; then - dst=$src + dst="$src" src="" - if [ -d $dst ]; then + if [ -d "$dst" ]; then instcmd=: chmodcmd="" else @@ -128,7 +128,7 @@ else # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. - if [ -f $src -o -d $src ] + if [ -f "$src" -o -d "$src" ] then true else @@ -147,16 +147,16 @@ else # 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 ] + if [ -d "$dst" ] then - dst="$dst"/`basename $src` + dst="$dst"/`basename "$src"` else true fi fi ## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` +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 @@ -192,42 +192,42 @@ fi if [ x"$dir_arg" != x ] then - $doit $instcmd $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 + 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 # If we're going to rename the final executable, determine the name now. if [ x"$transformarg" = x ] then - dstfile=`basename $dst` + dstfile=`basename "$dst"` else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename + 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` + dstfile=`basename "$dst"` else true fi # Make a temp file name in the proper directory. - dsttmp=$dstdir/#inst.$$# + 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 && + trap "rm -f \"${dsttmp}\"" 0 && # and set any options; do chmod last to preserve setuid bits @@ -235,15 +235,15 @@ else # 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 && + 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 -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + $doit $rmcmd -f "$dstdir/$dstfile" && + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" fi && |