fix numbering of variants to be 1 and 2 (closes: #867586)

[deb_pkgs/scowl.git] / src / make-dist

diff --git a/src/make-dist b/src/make-dist
index 9dc9e38d6c1e1a3a7eeecc48a3ee22704d0b1948..cc7cd6b747d2ad9fb95a7e1bbb8641793b4c2b80 100755 (executable)
--- a/src/make-dist
+++ b/src/make-dist
@@ -1,5 +1,13 @@
 #!/bin/sh
 
+# Make the final release from a clean git checkout to avoid including
+# unnecessary garbage!
+
+if [ "$#" -ne 1 ]; then
+  echo "Usage: $0 VERSION"
+  exit 1
+fi
+
 echo clean
 
 make -s clean
@@ -10,28 +18,32 @@ rm -f scowl-$1.*
 echo levels
 
 rm l/levels-list 2> /dev/null
-ls -lRF l | sed 's/^.*kevina.*..:.. /  /' | sed '/total/d' > l.dir
-tar cf l.tar l/
+ls --full-time -R -F l | sed 's/^.*kevina.*[-+]0... /  /' | sed '/total/d' > l.dir
+tar -c -f l.tar l/
 
 echo copy
 
 mkdir scowl-$1
-
+ 
 mkdir scowl-$1/r/
 cp r/README scowl-$1/r/
 cp -a r/special scowl-$1/r/
 
+BASE=`pwd`
+
 cd r/
 for d in `ls -I README -I special -I ATTIC`
 do
+  echo ... r/$d
   cd $d
-  mkdir ../../scowl-$1/r/$d/
-  cp `cat .keep` ../../scowl-$1/r/$d/
-  cd ..
+  mkdir $BASE/scowl-$1/r/$d/
+  cp `cat .keep` $BASE/scowl-$1/r/$d/
+  cd $BASE/r
 done
 cd ..
 
-cp -a README Makefile l.dir l.tar src final scowl-$1/
+cp -a README README.in Makefile mk-list Copyright l.dir l.tar src final misc speller scowl-$1/
+echo $1 > scowl-$1/VERSION
 
 echo tar
 tar cf scowl-$1.tar scowl-$1/
@@ -39,5 +51,6 @@ gzip -9 scowl-$1.tar
 
 echo zip
 cd scowl-$1
+rm speller/final speller/misc speller/src
 zip -q9lr ../scowl-$1.zip *