From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 13 Aug 2017 11:38:10 +0000 (+0200)
Subject: src/scripts/tarball: Clean up to prepare for the next commit
X-Git-Tag: v4.4.0~23
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=240474195d69bdaacbe0bfab07be3e4b6444e2bf

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 1ce6341dd..3426203ed 100755
--- a/src/scripts/tarball
+++ b/src/scripts/tarball
@@ -5,16 +5,17 @@ if [ $# = 0 ]; then
     exit 1
 fi
 
-name="$1-$2"
+name="$1"
 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
-trap 'rm -rf "$name"' 0
+trap 'rm -rf "$nv"' 0
 
 dir=.
 until [ $# = 0 ]; do
@@ -24,9 +25,9 @@ until [ $# = 0 ]; do
 	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
 
-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