X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=9598323e4ed4cd766b19076ac4a6907d3b9cb2e5;hb=e1fe30c68b3126998e6e7f9ea92405f055529006;hp=151e464d19b5d7a9fabc8784a02eb40723c6ab0c;hpb=7ed30144c35faf480529030343bd200ae44301a1;p=grml-live.git

diff --git a/grml-live b/grml-live
index 151e464..9598323 100755
--- a/grml-live
+++ b/grml-live
@@ -23,7 +23,7 @@ fi
 set -e
 
 # global variables
-GRML_LIVE_VERSION='0.11.0'
+GRML_LIVE_VERSION='0.12.1'
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list'
@@ -779,7 +779,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
 
       # generate addon list
       rm "${BUILD_OUTPUT}/${ADDONS_LIST_FILE}"
-      for name in $(ls "${BUILD_OUTPUT}"/boot/isolinux/addon_*.cfg) ; do
+      for name in "${BUILD_OUTPUT}"/boot/isolinux/addon_*.cfg ; do
         include_name=$(basename "$name")
         echo "include $include_name"  >> "${BUILD_OUTPUT}/${ADDONS_LIST_FILE}"
       done
@@ -1090,10 +1090,10 @@ else
       else
          # isoinfo is part of both mkisofs and genisoimage so we're good
          bootoff=$(isoinfo -l -i "${ISO_OUTPUT}/${ISO_NAME}" | \
-           sed -n '/^.*\[ *\([0-9]*\)[] ].*  ISOLINUX.BIN;1 *$/s//\1/p')
+           sed -n '/^.*\[ *\([0-9]*\)[] ].* ISOLINUX.BIN;1 *$/s//\1/p')
          if ! [ -r boot/grub/core.img ] ; then
            ewarn "boot/grub/core.img not found, not creating manifold boot ISO file"
-         elif [ $bootoff -lt 1 ] ; then
+         elif [ "${bootoff:-0}" -lt 1 ] ; then
            ewarn "isolinux.bin not found on the ISO file, disabling manifold boot"
          else
            log "Creating hybrid ISO file with manifold method"