Added tag 0.7.8 for changeset e10c87f88ec9ef7ec99f9773bb77ac745ea7aebf

[grml2usb.git] / grml2usb

diff --git a/grml2usb b/grml2usb
index 5a9eed0..3153a72 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.
-# Latest change: Don Sep 13 01:38:26 CEST 2007 [mika]
+# Latest change: Fre Nov 16 08:29:17 CET 2007 [mika]
 ################################################################################
 
 # colors {{{
@@ -49,7 +49,7 @@
   LANGUAGE='C'
   LC_ALL='C'
   PROGRAMNAME=${0##*/}
-  VERSION='0.7.6'
+  VERSION='0.7.8'
   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
-    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}
+    fi
+
+    rmdir ${DEVICE}/boot 2>/dev/null
+
     sync && echo "${WHITE}done${NORMAL}"
   else
     unmount