X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=tarball.sh;h=895d3ed5617992fcefb9e77fda87c09acdbf4220;hp=4afc4319a1bacd6afe0e09592e66b1da6a1ad901;hb=19b2fe785e5357247588698b1fd9f432f3c89c0d;hpb=0d8f722e4d22e8a3f579482cd7701785a1dd4359

diff --git a/tarball.sh b/tarball.sh
index 4afc431..895d3ed 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,6 +55,12 @@ printf "Installing files:\n"
 printf "  - /usr/sbin/grml2usb\n"
 install -m 755 \${BASE}/grml2usb /usr/sbin/grml2usb
 
+printf "  - /usr/sbin/grml2usb-compat\n"
+install -m 755 \${BASE}/grml2usb-compat /usr/sbin/grml2usb-compat
+
+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
@@ -87,13 +93,15 @@ 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/grml2usb-compat \\
+  /usr/sbin/grml2iso \\
   /usr/share/grml2usb/grub/splash.xpm.gz \\
   /usr/share/grml2usb/grub/grml.png \\
   /usr/share/grml2usb/lilo/lilo.static.amd64 \\
@@ -113,11 +121,14 @@ 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/
+cp grml2usb grml2usb-compat grml2iso mbr/mbrldr mbr/mbrmgr grub/* lilo/lilo.static.* grml2usb-$VERSION/
 
 tar zcf grml2usb.tgz "${DIR}"