Drop oudated tarball-online make target and support prepare-release instead

diff --git a/Makefile b/Makefile
index 5fa9476..9ed8a8a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,8 +45,9 @@ online: all
 tarball: all
        ./tarball.sh
 
 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
 
 clean:
        rm -rf grml2usb.8.html grml2usb.8.xml grml2usb.8

diff --git a/tarball.sh b/tarball.sh
index d643e5d..1f3b003 100755 (executable)
--- a/tarball.sh
+++ b/tarball.sh
@@ -122,8 +122,17 @@ tar zcf grml2usb.tgz "${DIR}"
 
 rm -rf "${DIR}"
 md5sum grml2usb.tgz > grml2usb.tgz.md5
 
 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 #################################################################
 
 ## END OF FILE #################################################################