OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2006-10-04 Brooks Moses <bmoses@stanford.edu>
[pf3gnuchains/gcc-fork.git]
/
install-sh
diff --git
a/install-sh
b/install-sh
index
dd97db7
..
4d4a951
100755
(executable)
--- a/
install-sh
+++ b/
install-sh
@@
-1,7
+1,7
@@
#!/bin/sh
# install - install a program, script, or datafile
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=200
4-09-10.20
+scriptversion=200
5-05-14.22
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@
-109,7
+109,7
@@
while test -n "$1"; do
shift
continue;;
shift
continue;;
- --help) echo "$usage"; exit
0
;;
+ --help) echo "$usage"; exit
$?
;;
-m) chmodcmd="$chmodprog $2"
shift
-m) chmodcmd="$chmodprog $2"
shift
@@
-134,7
+134,7
@@
while test -n "$1"; do
shift
continue;;
shift
continue;;
- --version) echo "$0 $scriptversion"; exit
0
;;
+ --version) echo "$0 $scriptversion"; exit
$?
;;
*) # When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
*) # When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
@@
-213,7
+213,7
@@
do
fi
# This sed command emulates the dirname command.
fi
# This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,
[^/]*$,,;s,/
$,,;s,^$,.,'`
+ dstdir=`echo "$dst" | sed -e 's,
/*$,,;s,[^/]*$,,;s,/*
$,,;s,^$,.,'`
# Make sure that the destination directory exists.
# Make sure that the destination directory exists.
@@
-226,7
+226,8
@@
do
oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
- set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ shift
IFS=$oIFS
pathcomp=
IFS=$oIFS
pathcomp=
@@
-295,7
+296,7
@@
do
|| $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|| {
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
|| $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|| {
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit
+ (exit 1); exit
1
}
else
:
}
else
:
@@
-306,12
+307,12
@@
do
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
}
}
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
}
}
- fi || { (exit 1); exit; }
+ fi || { (exit 1); exit
1
; }
done
# The final little trick to "correctly" pass the exit status to the exit trap.
{
done
# The final little trick to "correctly" pass the exit status to the exit trap.
{
- (exit 0); exit
+ (exit 0); exit
0
}
# Local variables:
}
# Local variables: