ossp-pkg/shtool/sh.arx 1.21 -> 1.22
--- sh.arx 2004/02/12 16:06:26 1.21
+++ sh.arx 2005/06/15 08:11:16 1.22
@@ -34,7 +34,7 @@
files="$*"
# walk through the file list and expand archives members
-tmpdir=`echo $archive | sed -e 's;[^/]*$;.arx;'`
+ar_tmpdir=`echo $archive | sed -e 's;[^/]*$;.arx;'`
nfiles=''
if [ ".$files" != . ]; then
for file in $files; do
@@ -44,13 +44,13 @@
fi
case $file in
*.a )
- if [ ! -d $tmpdir ]; then
+ if [ ! -d $ar_tmpdir ]; then
if [ ".$opt_t" = .yes ]; then
- echo "mkdir $tmpdir" 1>&2
+ echo "mkdir $ar_tmpdir" 1>&2
fi
- mkdir $tmpdir
+ mkdir $ar_tmpdir
fi
- case $tmpdir in
+ case $ar_tmpdir in
.arx )
from="../$file"
;;
@@ -61,16 +61,16 @@
;;
esac
if [ ".$opt_t" = .yes ]; then
- echo "(cd $tmpdir && $ar_prg x $from)" 1>&2
+ echo "(cd $ar_tmpdir && $ar_prg x $from)" 1>&2
fi
- (cd $tmpdir && eval $ar_prg x $from)
+ (cd $ar_tmpdir && eval $ar_prg x $from)
if [ $? -ne 0 ]; then
echo "$msgprefix:Error: member extraction failed for archive: $file" 1>&2
shtool_exit 1
fi
for member in - `eval $ar_prg t $file | sed -e '/_\.SYMDEF/d'`; do
[ ".$member" = .- ] && continue
- nfiles="$nfiles $tmpdir/$member"
+ nfiles="$nfiles $ar_tmpdir/$member"
done
;;
* )
@@ -91,11 +91,11 @@
fi
# cleanup and die gracefully
-if [ -d $tmpdir ]; then
+if [ -d $ar_tmpdir ]; then
if [ ".$opt_t" = .yes ]; then
- echo "rm -rf $tmpdir" 1>&2
+ echo "rm -rf $ar_tmpdir" 1>&2
fi
- rm -rf $tmpdir
+ rm -rf $ar_tmpdir
fi
shtool_exit 0
|
|
