From 09149d774d47e757ca6df1e9363fa8cb75d41740 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 26 Apr 2012 17:56:10 +0200 Subject: [PATCH] Drop oudated tarball-online make target and support prepare-release instead --- Makefile | 5 +++-- tarball.sh | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5fa9476..9ed8a8a 100644 --- a/Makefile +++ b/Makefile @@ -45,8 +45,9 @@ online: all tarball: all ./tarball.sh -tarball-online: tarball - scp grml2usb.tgz grml2usb.tgz.md5.asc grml:/var/www/grml/grml2usb/ +prepare-release: + ./tarball.sh --no-gpg + clean: rm -rf grml2usb.8.html grml2usb.8.xml grml2usb.8 diff --git a/tarball.sh b/tarball.sh index d643e5d..1f3b003 100755 --- a/tarball.sh +++ b/tarball.sh @@ -122,8 +122,17 @@ tar zcf grml2usb.tgz "${DIR}" rm -rf "${DIR}" md5sum grml2usb.tgz > grml2usb.tgz.md5 -gpg --clearsign grml2usb.tgz.md5 -rm grml2usb.tgz.md5 -echo "Generated grml2usb.tgz and grml2usb.tgz.md5.asc of grml2usb $VERSION" + +case "$1" in + --no-gpg) + echo "Not signing grml2usb.tgz.md5 as requested via --no-gpg." + echo "Do not forget to run gpg --clearsign grml2usb.tgz.md5 before uploading." + ;; + *) + gpg --clearsign grml2usb.tgz.md5 + rm grml2usb.tgz.md5 + echo "Generated grml2usb.tgz and grml2usb.tgz.md5.asc of grml2usb $VERSION" + ;; +esac ## END OF FILE ################################################################# -- 2.1.4