ossp-pkg/shtool/sh.install 1.25 -> 1.26
--- sh.install 2002/11/02 12:46:19 1.25
+++ sh.install 2003/02/11 12:56:39 1.26
@@ -54,9 +54,9 @@
cmd="$cmd -t"
fi
for dir in "$@"; do
- eval "$cmd $dir" || exit $?
+ eval "$cmd $dir" || shtool_exit $?
done
- exit 0
+ shtool_exit 0
fi
# determine source(s) and destination
@@ -78,7 +78,7 @@
# consistency check for destination
if [ $argc -gt 2 -a $dstisdir = 0 ]; then
echo "$msgprefix:Error: multiple sources require destination to be directory" 1>&2
- exit 1
+ shtool_exit 1
fi
# iterate over all source(s)
@@ -120,12 +120,12 @@
if [ ".$opt_t" = .yes ]; then
echo "cp $src $dsttmp" 1>&2
fi
- cp $src $dsttmp || exit $?
+ cp $src $dsttmp || shtool_exit $?
else
if [ ".$opt_t" = .yes ]; then
echo "mv $src $dsttmp" 1>&2
fi
- mv $src $dsttmp || exit $?
+ mv $src $dsttmp || shtool_exit $?
fi
# adjust the target file
@@ -137,32 +137,32 @@
sed="$sed -e '$e'"
done
cp $dsttmp $dsttmp.old
- eval "$sed <$dsttmp.old >$dsttmp" || exit $?
+ eval "$sed <$dsttmp.old >$dsttmp" || shtool_exit $?
rm -f $dsttmp.old
fi
if [ ".$opt_s" = .yes ]; then
if [ ".$opt_t" = .yes ]; then
echo "strip $dsttmp" 1>&2
fi
- strip $dsttmp || exit $?
+ strip $dsttmp || shtool_exit $?
fi
if [ ".$opt_o" != . ]; then
if [ ".$opt_t" = .yes ]; then
echo "chown $opt_o $dsttmp" 1>&2
fi
- chown $opt_o $dsttmp || exit $?
+ chown $opt_o $dsttmp || shtool_exit $?
fi
if [ ".$opt_g" != . ]; then
if [ ".$opt_t" = .yes ]; then
echo "chgrp $opt_g $dsttmp" 1>&2
fi
- chgrp $opt_g $dsttmp || exit $?
+ chgrp $opt_g $dsttmp || shtool_exit $?
fi
if [ ".$opt_m" != ".-" ]; then
if [ ".$opt_t" = .yes ]; then
echo "chmod $opt_m $dsttmp" 1>&2
fi
- chmod $opt_m $dsttmp || exit $?
+ chmod $opt_m $dsttmp || shtool_exit $?
fi
# determine whether to do a quick install
|
|
