Browse Source

Bugfix: get make-release to work

Luke Dashjr 13 years ago
parent
commit
c8d03ff6c3
1 changed files with 5 additions and 2 deletions
  1. 5 2
      make-release

+ 5 - 2
make-release

@@ -1,8 +1,9 @@
 #!/bin/bash
 #!/bin/bash
+set -e
 set -x
 set -x
 tag="$1"; shift
 tag="$1"; shift
 [ -n "$tag" ] || exit 1
 [ -n "$tag" ] || exit 1
-sw="$1"; shift
+sw="$1"; shift || true
 [ -n "$sw" ] || sw="$tag"
 [ -n "$sw" ] || sw="$tag"
 
 
 IDIR="$PWD"
 IDIR="$PWD"
@@ -19,7 +20,9 @@ cp -v \
 	pthreadGC2.dll \
 	pthreadGC2.dll \
 	libusb-1.0.dll \
 	libusb-1.0.dll \
 	"$OUTDIR/"
 	"$OUTDIR/"
-git clone . "$TMPDIR" -b "$tag" --depth 1
+git branch TMP "$tag"
+git clone . "$TMPDIR" -b TMP --depth 1
+git branch -D TMP
 cd "$TMPDIR"
 cd "$TMPDIR"
 git archive --prefix "$sw"/ --format tar "$tag" | tar xvp
 git archive --prefix "$sw"/ --format tar "$tag" | tar xvp
 cd "$sw"
 cd "$sw"