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

Luca Capello luca at pca.it
Wed Jun 17 11:13:53 UTC 2009


The following commit has been merged in the master branch:
commit 6ee3c6e0e5e4255a729983817f5a193b102b41a0
Author: Luca Capello <luca at pca.it>
Date:   Tue Jun 16 21:26:03 2009 +0200

    install.sh: use action_all function
    
    Thanks to Brian DeRocher <brian at derocher.org>.

diff --git a/install.sh b/install.sh
index 79291b3..f681360 100755
--- a/install.sh
+++ b/install.sh
@@ -471,10 +471,28 @@ I: dash as default /bin/sh se to $DASH_BINSH
 
 __END__
 
-	for f in testing time partition format mount debian apt fso configuration kernel unmount
+	for f in testing time partition format mount debian apt fso configuration tasks kernel cleanup unmount
 	do
-		if [ -n "$VERBOSE" ]; then echo calling '$f'; fi
-		action_$f
+		case "$f" in
+			"partition")
+				if [ -n "$intern_no_partitioning" ]; then
+					echo " * Skipping partitioning since --no-partitioning flag set"
+				else
+					action_partition
+				fi
+				;;
+			"tasks")
+				if [ -z "$TASKS" ]; then
+					echo " * Skipping over installing tasks since none were specified"
+				else
+					action_tasks
+				fi
+				;;
+			*)
+				if [ -n "$VERBOSE" ]; then echo calling '$f'; fi
+				action_$f
+				;;
+		esac
 	done
 	cat <<__END__
 
@@ -1468,25 +1486,8 @@ do
 			MOUNT_PROC="true"
 			;;
 		 "all")
-			action_testing
-			action_time
-			if [ -n "$intern_no_partitioning" ]; then
-				echo " * Skipping partitioning since --no-partitioning flag set"
-			else
-				action_partition
-			fi
-			action_format
-			action_mount
-			action_debian
-			action_apt
-			action_fso
-			action_configuration
-			if [ -n "$TASKS" ]; then
-				action_tasks
-			fi
-			action_kernel
-			action_cleanup
-			action_unmount
+			echo "Running all stages"
+			action_all
 			;;
 		 "testing"|"time"|"partition"|"format"|"mount"|"debian"|"apt"|"fso"|"configuration"|"kernel"|"unmount"|"uboot"|"tasks")
 			if [ -z "$showHelp" ]; then

-- 
Various non-packaged files



More information about the pkg-fso-commits mailing list