Further bugfixes.

[grml2usb.git] / tarball.sh

diff --git a/tarball.sh b/tarball.sh
index 4afc431..1f3b003 100755 (executable)
--- a/tarball.sh
+++ b/tarball.sh
@@ -8,8 +8,7 @@
 
 set -e
 
-VERSION="$(awk '/^PROG_VERSION/ { print $3}' grml2usb | tr -d \")"
-
+VERSION=$(dpkg-parsechangelog | awk '/Version: / { print $2 }')
 DIR="grml2usb-${VERSION}"
 [ -d "$DIR" ] || mkdir "$DIR"
 
@@ -43,8 +42,8 @@ cat > "${DIR}"/install.sh << EOF
 
 set -e
 
-if [ "\$UID" != 0 ] ; then
-   echo "Error: become root before starting $0" >& 2
+if [ \$(id -u) != 0 ] ; then
+   echo "Error: become root before starting \$0" >& 2
    exit 1
 fi
 
@@ -55,18 +54,15 @@ printf "Installing files:\n"
 printf "  - /usr/sbin/grml2usb\n"
 install -m 755 \${BASE}/grml2usb /usr/sbin/grml2usb
 
+printf "  - /usr/sbin/grml2iso\n"
+install -m 755 \${BASE}/grml2iso /usr/sbin/grml2iso
+
 [ -d /usr/share/grml2usb/grub ] || mkdir -p /usr/share/grml2usb/grub
 printf "  - /usr/share/grml2usb/grub/splash.xpm.gz\n"
 install -m 644 \${BASE}/splash.xpm.gz /usr/share/grml2usb/grub/splash.xpm.gz
 printf "  - /usr/share/grml2usb/grub/grml.png\n"
 install -m 644 \${BASE}/grml.png      /usr/share/grml2usb/grub/grml.png
 
-[ -d /usr/share/grml2usb/lilo ] || mkdir -p /usr/share/grml2usb/lilo
-printf "  - /usr/share/grml2usb/lilo/lilo.static.amd64\n"
-install -m 755 \${BASE}/lilo.static.amd64 /usr/share/grml2usb/lilo/lilo.static.amd64
-printf "  - /usr/share/grml2usb/lilo/lilo.static.i386\n"
-install -m 755 \${BASE}/lilo.static.i386  /usr/share/grml2usb/lilo/lilo.static.i386
-
 [ -d /usr/share/grml2usb/mbr ] || mkdir -p /usr/share/grml2usb/mbr
 printf "  - /usr/share/grml2usb/mbr/mbrmgr\n"
 install -m 644 \${BASE}/mbrmgr /usr/share/grml2usb/mbr/mbrmgr
@@ -87,17 +83,16 @@ cat > "${DIR}"/uninstall.sh << EOF
 
 set -e
 
-if [ "\$UID" != 0 ] ; then
-   echo "Error: become root before starting $0" >& 2
+if [ \$(id -u) != 0 ] ; then
+   echo "Error: become root before starting \$0" >& 2
    exit 1
 fi
 
 for file in \\
   /usr/sbin/grml2usb \\
+  /usr/sbin/grml2iso \\
   /usr/share/grml2usb/grub/splash.xpm.gz \\
   /usr/share/grml2usb/grub/grml.png \\
-  /usr/share/grml2usb/lilo/lilo.static.amd64 \\
-  /usr/share/grml2usb/lilo/lilo.static.i386 \\
   /usr/share/grml2usb/mbr/mbrmgr \\
   /usr/share/grml2usb/mbr/mbrldr \\
   /usr/share/man/man8/grml2usb.8.gz \\
@@ -113,18 +108,31 @@ fakeroot debian/rules build
 
 # manpage
 cp grml2usb.8.txt grml2usb-$VERSION/
+cp grml2iso.8.txt grml2usb-$VERSION/
 gzip -9 --to-stdout grml2usb-$VERSION/grml2usb.8.txt > grml2usb-$VERSION/grml2usb.8.gz
+gzip -9 --to-stdout grml2usb-$VERSION/grml2iso.8.txt > grml2usb-$VERSION/grml2iso.8.gz
 rm grml2usb-$VERSION/grml2usb.8.txt
+rm grml2usb-$VERSION/grml2iso.8.txt
 
-# binaries, grub, lilo
-cp grml2usb mbr/mbrldr mbr/mbrmgr grub/* lilo/lilo.static.* grml2usb-$VERSION/
+# binaries, grub
+cp grml2usb grml2iso mbr/mbrldr mbr/mbrmgr grub/* grml2usb-$VERSION/
+sed -i -e "s/PROG_VERSION='\*\*\*UNRELEASED\*\*\*'/PROG_VERSION='${VERSION}'/" grml2usb-$VERSION/grml2usb
 
 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 #################################################################