Fix mismerge

[exim.git] / release-process / scripts / quickrelease

diff --git a/release-process/scripts/quickrelease b/release-process/scripts/quickrelease
index dd16fa0f5b6685629d4e479b7e9937d6332ee735..24da1f678ce871b8b33bdb7e264318fcd90cd4df 100755 (executable)
--- a/release-process/scripts/quickrelease
+++ b/release-process/scripts/quickrelease
@@ -3,28 +3,8 @@
 # A really dumb script for making a quick tarball of Exim
 
 set -e
-
-OWD=$(pwd -P)
-
-GWD=$(git rev-parse --git-dir)
-
-TWD=$(mktemp -d -t exim) || exit 1
-echo $TWD
-cd $TWD
-
-git clone $GWD
-
-cd exim/src/src
-../scripts/reversion
-. version.sh
-EXIM=exim-${EXIM_RELEASE_VERSION}${EXIM_VARIANT_VERSION}
-
-cd ../..
-mv src $EXIM
-tar cfz $EXIM.tar.gz $EXIM
-mv $EXIM src
-
-cd $OWD
-mv $TWD/exim/$EXIM.tar.gz .
-rm -rf $EXIM
-echo $EXIM.tar.gz
+trap 'test -n "$TMP_DIR" && rm -r "$TMP_DIR"' EXIT
+commit="${1:-HEAD}"
+version=`git describe "$commit"`
+`dirname $0`/mk_exim_release --no-sizes --no-doc --comp gzip --no-sig --quick "$commit" .
+echo $version*