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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit aed8308ae46e5139415108fc1b339a10f33c4192
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Feb 28 15:55:08 2009 +0100

    Complete work on tasks for installer.

diff --git a/install.sh b/install.sh
index 71003d8..491d5ce 100755
--- a/install.sh
+++ b/install.sh
@@ -57,7 +57,6 @@ SD_PART1_SIZE=${SD_PART1_SIZE:-8}
 SD_PART2_FS=${SD_PART2_FS:-ext3}
 SD_SWAP_SIZE=${SD_SWAP_SIZE:-0}
 SINGLE_PART=${SINGLE_PART:-$QI}
-WITH_WIFI=${WITH_WIFI:-none}
 
 # hardening for the case that a user uses capitals
 lc SD_PART1_FS SD_PART2_FS APT_RECOMMENDS QI QI_VERBOSE_BOOT FSO_DEVICE
@@ -286,7 +285,28 @@ OPTIONS
                      sets the SD_PART1_SIZE variable
 	--swap-size <megabytes>
                      sets the SD_SWAP_SIZE variable
-	--with-wifi  sets the WITH_WIFI variable (experimental, non functional)
+
+EXAMPLE
+
+	./install.sh --part1-fs vfat --part1-size 16  all
+
+	Performs a complete installation. Tasks would be addressed if the
+	TASKS environment variable would have been set.
+
+	TASKS="GAMES,GPS" ./install.sh --part1-fs vfat --part1-size 16  all
+
+	As before, but now extra packages are installed (and configured)
+	to prepare a selection of games and a reasonably complete utilisation
+	of the GPS funcionality.
+
+	TASKS="GAMES,GPS" ./install.sh --part1-fs vfat --part1-size 16  tasks
+
+	This is the delta between the prior two examples.
+
+	TASKS="GAMES,GPS" ./install.sh --part1-fs vfat --part1-size 16
+
+	E: This does nothing since no install target is defined.
+
 
 BUGS
 	Only the current (second) generation of devices is supported.
@@ -731,10 +751,10 @@ action_tasks () {
 
 	echo "Performing selected tasks: $TASKS"
 
-	for $intern_task in $TASKS
+	for intern_task in $( echo $TASKS|tr "," " ")
 	do
 		echo " * task: $intern_task"
-		eval chroot "$INST_DIR" apt-get install $APT_OPTIONS \$PACKAGES_TASKS_$intern_task
+		eval chroot "$INST_DIR" apt-get install $APT_OPTIONS \$PACKAGES_TASK_$intern_task
 		chroot "$INST_DIR" apt-get clean
 		echo "I: Selection of packages for task $intern_task installed"
 
@@ -1193,9 +1213,9 @@ do
 			assignNumeric="true"
 			assignVariablename="SD_SWAP_SIZE"
 			;;
-		 "--with-wifi")
+		 "--with-tasks")
                         assignParametername="$i"
-			assignVariablename="WITH_WIFI"
+			assignVariablename="TASKS"
 			;;
 
 		 "minimal")
@@ -1222,12 +1242,14 @@ do
 			action_apt
 			action_fso
 			action_configuration
-			action_games
+			if [ -n "$TASKS" ]; then
+				action_tasks
+			fi
 			action_kernel
 			action_uboot
 			action_unmount
 			;;
-		 "testing"|"time"|"partition"|"format"|"mount"|"debian"|"apt"|"fso"|"configuration"|"kernel"|"unmount"|"uboot"|"games")
+		 "testing"|"time"|"partition"|"format"|"mount"|"debian"|"apt"|"fso"|"configuration"|"kernel"|"unmount"|"uboot"|"tasks")
 			if [ -z "$showHelp" ]; then
 				echo "Running stage $i"
 				action_$i

-- 
Various non-packaged files