ossp-pkg/shtool/sh.move 1.15 -> 1.16
--- sh.move 2001/12/31 15:06:04 1.15
+++ sh.move 2003/02/11 12:56:40 1.16
@@ -37,11 +37,11 @@
# consistency checks
if [ ".$src" = . -o ".$dst" = . ]; then
echo "$msgprefix:Error: Invalid arguments" 1>&2
- exit 1
+ shtool_exit 1
fi
if [ ".$src" = ".$dst" ]; then
echo "$msgprefix:Error: Source and destination files are the same" 1>&2
- exit 1
+ shtool_exit 1
fi
expsrc="$src"
if [ ".$opt_e" = .yes ]; then
@@ -50,20 +50,20 @@
if [ ".$opt_e" = .yes ]; then
if [ ".`echo "$src" | sed -e 's;^.*\\*.*$;;'`" = ".$src" ]; then
echo "$msgprefix:Error: Source doesn't contain wildcard ('*'): $dst" 1>&2
- exit 1
+ shtool_exit 1
fi
if [ ".`echo "$dst" | sed -e 's;^.*%[1-9].*$;;'`" = ".$dst" ]; then
echo "$msgprefix:Error: Destination doesn't contain substitution ('%N'): $dst" 1>&2
- exit 1
+ shtool_exit 1
fi
if [ ".$expsrc" = ".$src" ]; then
echo "$msgprefix:Error: Sources not found or no asterisk : $src" 1>&2
- exit 1
+ shtool_exit 1
fi
else
if [ ! -r "$src" ]; then
echo "$msgprefix:Error: Source not found: $src" 1>&2
- exit 1
+ shtool_exit 1
fi
fi
@@ -113,5 +113,5 @@
break;
fi
done
-exit $errorstatus
+shtool_exit $errorstatus
|
|
