summaryrefslogtreecommitdiff
path: root/install-sh
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-21 23:48:55 +1100
committerDamien Miller <djm@mindrot.org>2003-11-21 23:48:55 +1100
commita8e06cef35c205e1aa562513c6d034a10c8c9a6d (patch)
treecf8bdb4466f553088c020b9179cabd6eaf196075 /install-sh
parent8c5e91c03fdd2693f0635f8b2a9904bffc94ce16 (diff)
- djm@cvs.openbsd.org 2003/11/21 11:57:03
[everything] unexpand and delete whitespace at EOL; ok markus@ (done locally and RCS IDs synced)
Diffstat (limited to 'install-sh')
-rwxr-xr-xinstall-sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/install-sh b/install-sh
index e9de23842..220abbf61 100755
--- a/install-sh
+++ b/install-sh
@@ -125,7 +125,7 @@ if [ x"$dir_arg" != x ]; then
125else 125else
126 126
127# Waiting for this to be detected by the "$instcmd $src $dsttmp" command 127# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
128# might cause directories to be created, which would be especially bad 128# might cause directories to be created, which would be especially bad
129# if $src (and thus $dsttmp) contains '*'. 129# if $src (and thus $dsttmp) contains '*'.
130 130
131 if [ -f $src -o -d $src ] 131 if [ -f $src -o -d $src ]
@@ -180,7 +180,7 @@ while [ $# -ne 0 ] ; do
180 shift 180 shift
181 181
182 if [ ! -d "${pathcomp}" ] ; 182 if [ ! -d "${pathcomp}" ] ;
183 then 183 then
184 $mkdirprog "${pathcomp}" 184 $mkdirprog "${pathcomp}"
185 else 185 else
186 true 186 true
@@ -202,17 +202,17 @@ else
202 202
203# If we're going to rename the final executable, determine the name now. 203# If we're going to rename the final executable, determine the name now.
204 204
205 if [ x"$transformarg" = x ] 205 if [ x"$transformarg" = x ]
206 then 206 then
207 dstfile=`basename $dst` 207 dstfile=`basename $dst`
208 else 208 else
209 dstfile=`basename $dst $transformbasename | 209 dstfile=`basename $dst $transformbasename |
210 sed $transformarg`$transformbasename 210 sed $transformarg`$transformbasename
211 fi 211 fi
212 212
213# don't allow the sed command to completely eliminate the filename 213# don't allow the sed command to completely eliminate the filename
214 214
215 if [ x"$dstfile" = x ] 215 if [ x"$dstfile" = x ]
216 then 216 then
217 dstfile=`basename $dst` 217 dstfile=`basename $dst`
218 else 218 else
@@ -243,7 +243,7 @@ else
243# Now rename the file to the real destination. 243# Now rename the file to the real destination.
244 244
245 $doit $rmcmd -f $dstdir/$dstfile && 245 $doit $rmcmd -f $dstdir/$dstfile &&
246 $doit $mvcmd $dsttmp $dstdir/$dstfile 246 $doit $mvcmd $dsttmp $dstdir/$dstfile
247 247
248fi && 248fi &&
249 249