X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=tarball.sh;h=8bfa15e457333d18e44ed1bad82ae63cfdab48e0;hp=b7ed0dfeaab569892057930fe576c722a85ec7d8;hb=e5ae97fdf02635dee08648b2f2fb4006db269b17;hpb=543eab47532d209643cf47860e194c66b7970dc4

diff --git a/tarball.sh b/tarball.sh
index b7ed0df..8bfa15e 100755
--- a/tarball.sh
+++ b/tarball.sh
@@ -43,8 +43,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 +55,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 +84,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 \\
@@ -112,12 +108,15 @@ chmod 755 "${DIR}"/uninstall.sh
 fakeroot debian/rules build
 
 # manpage
-cp grml2usb.8.txt grml2usb-0.9.5/
-gzip -9 --to-stdout grml2usb-0.9.5/grml2usb.8.txt > grml2usb-0.9.5/grml2usb.8.gz
-rm grml2usb-0.9.5/grml2usb.8.txt
-
-# binaries, grub, lilo
-cp grml2usb mbr/mbrldr mbr/mbrmgr grub/* lilo/lilo.static.* grml2usb-0.9.5/
+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
+cp grml2usb grml2iso mbr/mbrldr mbr/mbrmgr grub/* grml2usb-$VERSION/
 
 tar zcf grml2usb.tgz "${DIR}"