src/scripts/tarball: Clean up to prepare for the next commit

We don't save $1 in a variable, only $1-$2.  Okay, because we don't
need $1 by itself.  However, the next commit will.  So save it.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/src/scripts/tarball b/src/scripts/tarball
index 1ce6341dd43a055e4c35226973a18af38187ea2e..3426203ed4705111c6cc12a67f8f6ee001f92550 100755 (executable)
--- a/src/scripts/tarball
+++ b/src/scripts/tarball
@@ -5,16 +5,17 @@ if [ $# = 0 ]; then
     exit 1
 fi
 
     exit 1
 fi
 

-name="$1-$2"
+name="$1"

 version="$2"
 shift; shift
 
 version="$2"
 shift; shift
 

-mkdir $name
-printf "%s" $version >$name/.tarball-version
->$name/.dirty-stamp
+nv=$name-$version
+mkdir $nv
+printf "%s" $version >$nv/.tarball-version
+>$nv/.dirty-stamp

 
 # arrange cleanup
 
 # arrange cleanup

-trap 'rm -rf "$name"' 0
+trap 'rm -rf "$nv"' 0

 
 dir=.
 until [ $# = 0 ]; do
 
 dir=.
 until [ $# = 0 ]; do


@@ -24,9 +25,9 @@ until [ $# = 0 ]; do
        echo "-C requires an argument" >&2
        exit 1
     fi
        echo "-C requires an argument" >&2
        exit 1
     fi

-    mkdir -p `dirname "$name/$1"`
-    ln "$dir/$1" "$name/$1"
+    mkdir -p `dirname "$nv/$1"`
+    ln "$dir/$1" "$nv/$1"

     shift
 done
 
     shift
 done
 

-tar -czf $name.tar.gz --owner=0 --group=0 --mode=ug+w,a+rX $name
+tar -czf $nv.tar.gz --owner=0 --group=0 --mode=ug+w,a+rX $nv