Adjust grml2usb for a present grub directory

diff --git a/debian/changelog b/debian/changelog
index e671daf..c13b965 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml2usb (0.7.8) unstable; urgency=low
+
+  * Adjust grml2usb for a present grub directory.
+
+ -- Michael Prokop <mika@grml.org>  Fri, 16 Nov 2007 08:29:20 +0100
+

 grml2usb (0.7.7) unstable; urgency=low
 
   * Improve error handling for execution of syslinux.
 grml2usb (0.7.7) unstable; urgency=low
 
   * Improve error handling for execution of syslinux.

diff --git a/grml2usb b/grml2usb
index 5a9eed0..693d06f 100755 (executable)
--- a/grml2usb
+++ b/grml2usb
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Don Sep 13 01:38:26 CEST 2007 [mika]
+# Latest change: Fre Nov 16 08:29:17 CET 2007 [mika]

 ################################################################################
 
 # colors {{{
 ################################################################################
 
 # colors {{{


@@ -49,7 +49,7 @@
   LANGUAGE='C'
   LC_ALL='C'
   PROGRAMNAME=${0##*/}
   LANGUAGE='C'
   LC_ALL='C'
   PROGRAMNAME=${0##*/}

-  VERSION='0.7.6'
+  VERSION='0.7.8'

   ISO="$1"
   DEVICE="$2"
 
   ISO="$1"
   DEVICE="$2"
 


@@ -184,9 +184,17 @@ copyit(){
        cp ${DEVICE}/boot/isolinux/isolinux.cfg ${DEVICE}/boot/isolinux/syslinux.cfg && \
        echo 'syslinux.cfg' >> $DEVICE/grml2usb.filelist
     fi
        cp ${DEVICE}/boot/isolinux/isolinux.cfg ${DEVICE}/boot/isolinux/syslinux.cfg && \
        echo 'syslinux.cfg' >> $DEVICE/grml2usb.filelist
     fi

-    mv    ${DEVICE}/boot/isolinux/* ${DEVICE}/    && \
-    rmdir ${DEVICE}/boot/isolinux                 && \
-    rmdir ${DEVICE}/boot/
+
+    if mv ${DEVICE}/boot/isolinux/* ${DEVICE}/ ; then
+       rmdir ${DEVICE}/boot/isolinux
+    fi
+
+    if [ -d ${DEIVCE}/boot/grub ] ; then
+       mv ${DEVICE}/boot/grub ${DEVICE} ; then
+    fi
+
+    rmdir ${DEVICE}/boot 2>/dev/null
+

     sync && echo "${WHITE}done${NORMAL}"
   else
     unmount
     sync && echo "${WHITE}done${NORMAL}"
   else
     unmount