make_image: avoid code duplication and improve whitespace consistency

tools/make_image

@@ -2,7 +2,6 @@
 #
 # Debian-cd helper script for making ISO / jigdo images
 #
-# Split out from the top-level Makefile SAM 2005/12/08
 
 set -e
 
@@ -70,12 +69,14 @@ do
     date
 
     # Work out whether we want ISO, jigdo or both
-    if [ "$MAXISOS"x = ""x ] || [ "$MAXISOS" = "all" ] || [ "$MAXISOS" = "ALL" ] || [ "$n" -le "$MAXISOS" ] ; then
+    if [ "$MAXISOS"x = ""x ] || [ "$MAXISOS" = "all" ] || \
+       [ "$MAXISOS" = "ALL" ] || [ "$n" -le "$MAXISOS" ] ; then
         ISO_WANTED=1
     else
         ISO_WANTED=0
     fi
-    if [ "$MAXJIGDOS"x = ""x ] || [ "$MAXJIGDOS" = "all" ] || [ "$MAXJIGDOS" = "ALL" ] || [ "$n" -le "$MAXJIGDOS" ] ; then
+    if [ "$MAXJIGDOS"x = ""x ] || [ "$MAXJIGDOS" = "all" ] || \
+       [ "$MAXJIGDOS" = "ALL" ] || [ "$n" -le "$MAXJIGDOS" ] ; then
         JIGDO_WANTED=1
     else
         JIGDO_WANTED=0
@@ -83,13 +84,11 @@ do
 
     # Actually make the ISO/jigdo images. Long command lines
     # here... :-(
+    CMD=
     if [ $JIGDO_WANTED = 0 ] && [ $ISO_WANTED = 1 ] ; then
 
         CMD="$MKISOFS $MKISOFS_OPTS -V '$volid' \
             -o $OUT/$OUTFILE.iso $opts $dirs CD$n"
-        echo $CMD
-        echo $CMD > CD$n/.disk/mkisofs
-        eval "$CMD"
 
     elif [ $JIGDO_WANTED = 1 ] && [ $ISO_WANTED = 1 ] ; then
 
@@ -101,9 +100,6 @@ do
             -jigdo-exclude boot$n \
             -md5-list $DIR/md5-check \
             $JIGDO_OPTS $opts $dirs CD$n"
-        echo $CMD
-        echo $CMD > CD$n/.disk/mkisofs
-        eval "$CMD"
 
     elif [ $JIGDO_WANTED = 1 ] && [ $ISO_WANTED = 0 ] ; then
 
@@ -115,13 +111,15 @@ do
             -jigdo-exclude boot$n \
             -md5-list $DIR/md5-check \
             $JIGDO_OPTS $opts $dirs CD$n"
-        echo $CMD
-        echo $CMD > CD$n/.disk/mkisofs
-        eval "$CMD"
 
     else
         echo "Neither jigdo nor iso wanted for CD$n"
     fi
+    if [ "$CMD" ]; then
+        echo $CMD
+        echo $CMD > CD$n/.disk/mkisofs
+        eval "$CMD"
+    fi
 
     # If we've made jigdo files, tweak them with extra info now
     if [ "$JIGDO_WANTED" = 1 ] ; then