projects
/
psensor-pkg-debian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reintegrated changes
[psensor-pkg-debian.git]
/
install-sh
diff --git
a/install-sh
b/install-sh
index
6781b98
..
a9244eb
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=20
09-04-28
.21; # UTC
+scriptversion=20
11-01-19
.21; # UTC
# 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
@@
-156,6
+156,10
@@
while test $# -ne 0; do
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
+ # Protect names problematic for `test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
shift;;
-T) no_target_directory=true;;
shift;;
-T) no_target_directory=true;;
@@
-186,6
+190,10
@@
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
fi
shift # arg
dst_arg=$arg
+ # Protect names problematic for `test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
done
fi
done
fi
@@
-200,7
+208,11
@@
if test $# -eq 0; then
fi
if test -z "$dir_arg"; then
fi
if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+ trap "ret=141; $do_exit" 13
+ trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
@@
-228,9
+240,9
@@
fi
for src
do
for src
do
- # Protect names
starting with `-'
.
+ # Protect names
problematic for `test' and other utilities
.
case $src in
case $src in
- -*) src=./$src;;
+ -*
| [=\(\)!]
) src=./$src;;
esac
if test -n "$dir_arg"; then
esac
if test -n "$dir_arg"; then
@@
-252,12
+264,7
@@
do
echo "$0: no destination specified." >&2
exit 1
fi
echo "$0: no destination specified." >&2
exit 1
fi
-
dst=$dst_arg
dst=$dst_arg
- # Protect names starting with `-'.
- case $dst in
- -*) dst=./$dst;;
- esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
@@
-385,7
+392,7
@@
do
case $dstdir in
/*) prefix='/';;
case $dstdir in
/*) prefix='/';;
-
-
*) prefix='./';;
+
[-=\(\)!]
*) prefix='./';;
*) prefix='';;
esac
*) prefix='';;
esac
@@
-403,7
+410,7
@@
do
for d
do
for d
do
- test
-z "$d"
&& continue
+ test
X"$d" = X
&& continue
prefix=$prefix$d
if test -d "$prefix"; then
prefix=$prefix$d
if test -d "$prefix"; then