X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-deb-build%2Fmkdist.sh;h=2aa0d5a86eff633604c66e4f6dd1bcb22f5f9a32;hb=68b66ad9c0d64c8d0958b871db445b0b4c03d711;hp=473013e7d5fd320585ee39be6e8b8ca83daa9d3b;hpb=2bcec6e9759afb8ab7d09b38c808239ebee29b13;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/mkdist.sh b/id-deb-build/mkdist.sh
index 473013e..2aa0d5a 100755
--- a/id-deb-build/mkdist.sh
+++ b/id-deb-build/mkdist.sh
@@ -3,6 +3,11 @@ die () {
   exit 1
 }
 
+if [ "x$1" = x-l ]; then
+  localFiles=t
+  shift
+fi
+
 if test -f IDMETA; then
   . ./IDMETA
 else
@@ -38,14 +43,30 @@ if [ "x$1" != x ]; then
 fi
 
 trap 'rm -f tmp.tar' 0
-git archive --format=tar --prefix=$NAME-$VERSION/ v${VERSION} > tmp.tar || die "This version is not tagged in Git";
+
+if [ -n "$localFiles" ]; then
+    echo "WARNING: using local files rather than git tag" >&2
+    echo "This is fine for testing, but should not be used for releases " >&2
+    pwd=`pwd`
+    dir=`basename "$pwd"`
+    cd ..
+    cp -a "$dir" $NAME-$VERSION
+    rm -rf $NAME-$VERSION/.git
+    tar cf "$pwd"/tmp.tar $NAME-$VERSION
+    rm -rf $NAME-$VERSION
+    cd "$dir"
+else
+    echo "from git"
+    git archive --format=tar --prefix=$NAME-$VERSION/ v${VERSION} > tmp.tar || die "This version is not tagged in Git";
+fi
+
 tar xf tmp.tar
 rm tmp.tar
 for file in debian $OMIT_FROM_DIST; do
   if [ -e "$file" ]; then
     echo "Omitting $file from distribution"
-    rm -r $NAME-$VERSION/$file
+    rm -rf $NAME-$VERSION/$file
   fi
 done
 tar cfz $NAME-$VERSION.tar.gz $NAME-$VERSION
-rm -r $NAME-$VERSION
+rm -rf $NAME-$VERSION