From c7b7370c1453d3ceb99cfc83039a664d05a48e3d Mon Sep 17 00:00:00 2001
From: JD Horelick <jdhore1@gmail.com>
Date: Fri, 3 Jun 2011 13:34:44 -0400
Subject: [PATCH] Fix makerelease.sh

---
 scripts/makerelease.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/scripts/makerelease.sh b/scripts/makerelease.sh
index ad5a33daf..106dd8838 100755
--- a/scripts/makerelease.sh
+++ b/scripts/makerelease.sh
@@ -23,15 +23,9 @@ if [ "x$1" = "x" ]; then
 	echo "usage: $0 releasename [--automatic]"
 	exit
 else
-	PROGRAM=`pwd | sed "s:/scripts::" | awk -F/ '{print $NF}'`
 	RELEASENAME="$1"
 fi
 
-if [[ $1 != $PROGRAM* ]]; then
-	echo "example: $0 $PROGRAM-1.2.3"
-	exit
-fi
-
 if [ "x$2" = "x--automatic" ]; then
 	AUTOMATIC="yes"
 fi
@@ -49,7 +43,10 @@ echo "Making release named $RELEASENAME (tip $TIP)"
 
 echo
 echo "Building root: $RELEASENAME/"
-git archive $RELEASENAME
+cd ..
+git archive --format=tar --prefix=$RELEASENAME/ HEAD | gzip >scripts/$RELEASENAME-working.tar.gz
+cd $WRKDIR
+tar -xzvf $RELEASENAME-working.tar.gz
 cd $RELEASENAME
 sh autogen.sh
 rm -rf autogen.sh autom4te.cache
@@ -63,10 +60,12 @@ fi
 cd ..
 
 echo "Building $RELEASENAME.tgz from $RELEASENAME/"
-tar zcf $RELEASENAME.tgz $RELEASENAME/
+tar zcf $RELEASENAME.tar.gz $RELEASENAME/
 
 echo "Building $RELEASENAME.tbz2 from $RELEASENAME/"
-tar jcf $RELEASENAME.tbz2 $RELEASENAME/
+tar jcf $RELEASENAME.tar.bz2 $RELEASENAME/
+
+rm $RELEASENAME-working.tar.gz
 
 PUBLISH="yes"