Make sure variable ISO is unset variable if not used

diff --git a/debian/changelog b/debian/changelog
index d0fec91..3174afd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-debootstrap (0.14) unstable; urgency=low
+
+  * Make sure variable ISO is unset variable if not used.
+    Thanks for the bugreport, Darsha! [Testing: issue352]
+
+ -- Michael Prokop <mika@grml.org>  Sun, 09 Dec 2007 20:16:15 +0100
+

 grml-debootstrap (0.13) unstable; urgency=low
 
   * Fix manpage handling of xsltproc.
 grml-debootstrap (0.13) unstable; urgency=low
 
   * Fix manpage handling of xsltproc.

diff --git a/grml-debootstrap b/grml-debootstrap
index d191161..8c988c9 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -161,13 +161,15 @@ else
 fi
 
 # make sure we have the right syntax when using an iso image
 fi
 
 # make sure we have the right syntax when using an iso image

-case $ISO in
-   file*) # do nothing
-    ;;
-   *)
-    ISO=file:$1
-    ;;
-esac
+if [ -n "$ISO" ] ; then
+   case $ISO in
+      file*) # do nothing
+      ;;
+      *)
+      ISO=file:$1
+      ;;
+   esac
+fi

 ISODIR=${ISO##file:}
 ISODIR=${ISODIR%%/}
 
 ISODIR=${ISO##file:}
 ISODIR=${ISODIR%%/}
 


@@ -439,4 +441,4 @@ else
 fi
 
 ## END OF FILE #################################################################
 fi
 
 ## END OF FILE #################################################################

-# vim: ai tw=100 expandtab foldmethod=marker
+# vim: ai tw=100 expandtab foldmethod=marker shiftwidth=3