grml-live-remaster: Slightly improve argument check and send error message to stderr

[grml-live.git] / remaster / grml-live-remaster

diff --git a/remaster/grml-live-remaster b/remaster/grml-live-remaster
index 456dbab..c480f03 100755 (executable)
--- a/remaster/grml-live-remaster
+++ b/remaster/grml-live-remaster
@@ -21,40 +21,62 @@ fi
 
 set -e # exit on any error
 
-VERSION='0.0.2'
+VERSION='0.0.3'
 GRML_LIVE_EDITOR=${VISUAL:-${EDITOR:-vi}}
 
 # source core functions {{{
+if ! [ -r /etc/grml/lsb-functions ] || ! [ -r /etc/grml/script-functions ] ; then
+  echo "Error: could not read /etc/grml/lsb-functions and/or /etc/grml/script-functions." >&2
+  echo "Error: $0 can run only in Grml live session. Exiting." >&2
+  exit 1
+fi
+
 . /etc/grml/lsb-functions
 . /etc/grml/script-functions
 # }}}
 
+if ! isgrmlcd ; then
+  echo "Error: $0 can run only in Grml live session. Exiting." >&2
+  exit 1
+fi
+
 # make sure we have what we need {{{
-check4progs mkisofs stat || exit 1
+if check4progs mkisofs >/dev/null 2>&1 ; then
+  MKISO=mkisofs
+fi
+
+if check4progs genisoimage >/dev/null 2>&1 ; then
+  MKISO=genisoimage
+fi
+
+if [ -z "$MKISO" ] ; then
+  echo "Error: neither mkisofs nor genisoimage available. Exiting." >&2
+  exit 1
+fi
+
+check4progs stat || exit 1
 
 # allow overriding via environment:
 if [ -z "$MKSQUASHFS" ] ; then
-  if which mksquashfs-lzma >/dev/null 2>&1 ; then
-    MKSQUASHFS=mksquashfs-lzma
-  elif which mksquashfs >/dev/null 2>&1 ; then
+  if which mksquashfs >/dev/null 2>&1 ; then
     MKSQUASHFS=mksquashfs
   else
-    echo "Error: neither mksquashfs-lzma nor mksquashfs present. Exiting."
+    echo "Error: mksquashfs is not available. Exiting." >&2
     exit 1
   fi
 fi
 check4root || exit 1
 # }}}
 
-if [ x"$1" == x ]; then
-   echo "$0 - version $VERSION"
-   echo ""
-   echo "Usage: $0 destination.iso"
-   echo "  destination.iso should point to a path that is on a hard disk,"
-   echo "  you might want to mount some swap partitions or swap files"
-   echo "  first, because grml-live-remaster will need a lot ot RAM."
-   echo ""
-   echo "Please report bugs and feature requests: http://grml.org/bugs/"
+if [ -z "$1" ]; then
+   echo "$0 - version $VERSION
+
+Usage: $0 destination.iso
+  destination.iso should point to a path that is on a hard disk,
+  you might want to mount some swap partitions or swap files
+  first, because grml-live-remaster will need a lot ot RAM.
+
+Please report bugs and feature requests: http://grml.org/bugs/" >&2
    exit 1
 fi
 
@@ -130,7 +152,7 @@ else
    ISOLINUX_BOOTCAT=boot.cat
 fi
 
-mkisofs -b $ISOLINUX -no-emul-boot -c $ISOLINUX_BOOTCAT \
+$MKISO -b $ISOLINUX -no-emul-boot -c $ISOLINUX_BOOTCAT \
         -boot-info-table -boot-load-size 4 -no-pad \
         -l -r -J -o "$1" /remaster/iso
 # pad for partition table