[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 0d8e3766bb8af63cd0f3b93eb24353bdb674718a

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 0d8e3766bb8af63cd0f3b93eb24353bdb674718a
Author: Steffen Moeller <moeller at debian.org>
Date:   Fri Aug 21 16:02:05 2009 +0200

    Don't exit before opportunity to see --help

diff --git a/install.sh b/install.sh
index f90ffe2..8d70a41 100755
--- a/install.sh
+++ b/install.sh
@@ -67,10 +67,6 @@ FSO_DEVICE_AUTODETECTED=`grep GTA /proc/cpuinfo | awk '{print $3}' | tr "[:upper
 if [ -z "$FSO_DEVICE" -a -n "$FSO_DEVICE_AUTODETECTED" ]; then
 	FSO_DEVICE=$FSO_DEVICE_AUTODETECTED
 fi
-if [ "$FSO_DEVICE" != gta01 -a "$FSO_DEVICE" != gta02 ]; then
-	echo "E: unsupported FSO_DEVICE '$FSO_DEVICE'"
-	exit 1
-fi
 
 # this is an user variable, which by default depends on the FSO_DEVICE value
 HOSTNAME=${HOSTNAME:-debian}
@@ -1496,12 +1492,23 @@ do
 			MOUNT_PROC="true"
 			;;
 		 "all")
-			echo "Running all stages"
-			action_all
+			if [ -z "$showHelp" ]; then
+				echo "Running all stages"
+				if [ "$FSO_DEVICE" != gta01 -a "$FSO_DEVICE" != gta02 ]; then
+					echo "E: unsupported FSO_DEVICE '$FSO_DEVICE'"
+					exit 1
+				fi
+				action_all
+				echo "I: Done with all stages"
+			fi
 			;;
 		 "testing"|"time"|"partition"|"format"|"mount"|"debian"|"apt"|"fso"|"configuration"|"kernel"|"unmount"|"uboot"|"tasks"|"cleanup")
 			if [ -z "$showHelp" ]; then
 				echo "Running stage $i"
+				if [ "$FSO_DEVICE" != gta01 -a "$FSO_DEVICE" != gta02 ]; then
+					echo "E: unsupported FSO_DEVICE '$FSO_DEVICE'"
+					exit 1
+				fi
 				action_$i
 				echo "I: Done with stage $i"
 			fi

-- 
Various non-packaged files