X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=e84e2674cfd6f013e8cc9d989a4d2c63a1078ba6;hp=1dd2f6a414215954d2a8798bdbc850aea1d8a7ea;hb=fafa0d86e842217845ce314bec5199b0506d597c;hpb=720b8599c9eb5e2d4ca6d395c18cea0932ce3da5

diff --git a/grml2iso b/grml2iso
index 1dd2f6a..e84e267 100755
--- a/grml2iso
+++ b/grml2iso
@@ -86,15 +86,16 @@ Options:
     case $name in
       o)   ISOFILE="$OPTARG";;
       b)   GRML2USB_OPTS+=(--bootoptions="$OPTARG");;
-      c)   DIR="$(readlink -f "$OPTARG")";;
+      c)   DIR="$(readlink -f "$OPTARG")"; [ -n "$DIR" ] || { echo "Could not read $OPTARG - exiting" >&2 ; exit 1 ; } ;;
       f)   FORCE='true';;
       r)   GRML2USB_OPTS+=(--remove-bootoption="$OPTARG");;
       p)   GRML2USB_OPTS+=("$OPTARG");;
       s)   URI="$OPTARG";;
-      t)   WRKDIR="$OPTARG";;
+      t)   WRKDIR="$(readlink -f "$OPTARG")";;
       ?)   usage 2;;
     esac
   done
+
   # test for specified URI
   if [ -n "$URI" ] ; then
     GRML2USB_OPTS+=(--bootoptions="fetch=$URI")
@@ -128,7 +129,8 @@ Options:
 
 # check for grml2usb {{{
   if [ ! -x "$(which $GRML2USB)" ] && [ ! -x "$GRML2USB" ] ; then
-    echo >&2 "Error: Could not find grml2usb"
+    echo "Error: Could not find grml2usb executable. Is /usr/sbin missing in PATH?" >&2
+    echo "Tip: run GRML2USB=/usr/sbin/grml2usb grml2iso ... as workaround" >&2
     if [ -x "./$GRML2USB" ] ; then
       echo >&2 "If you executed grml2iso from the grml2usb repository use"
       echo >&2 "GRML2USB=./grml2usb $0 $*"
@@ -162,10 +164,16 @@ Options:
 
 # move syslinux to isolinux {{{
   mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux
+  echo "menu label ^Isolinux prompt" > "$WRKDIR"/cddir/boot/isolinux/promptname.cfg
+  echo "include hd.cfg" >> "$WRKDIR"/cddir/boot/isolinux/grmlmain.cfg
+# }}}
 
+# change to $WRKDIR {{{
+  # make sure $WRKDIR is an absolute path, otherwise accessing files
+  # in it will fail later in the code path if user provided a
+  # relative directory
+  WRKDIR=$(realpath $WRKDIR)
   cd "$WRKDIR/cddir"
-  echo "menu label ^Isolinux prompt" > boot/isolinux/promptname.cfg
-  echo "include hd.cfg" >> boot/isolinux/grmlmain.cfg
 # }}}
 
 # efi boot {{{