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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 44e81d05c8041af9b7b0641e01b704a2f0792061
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Sep 20 12:07:27 2009 +0200

    added trayer variable

diff --git a/install.sh b/install.sh
index 77a253e..f1aff6e 100755
--- a/install.sh
+++ b/install.sh
@@ -61,6 +61,7 @@ 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}
+TRAYER=${TRAYER:-trayer}
 ZHONE=${ZHONE:-true}
 
 # hardening for the case that a user uses capitals
@@ -344,6 +345,8 @@ ENVIRONMENT
 	SINGLE_PART  set this to true if only one partition should be created
                      this is true by default for QI=true and false if SD_PART1_FS=vfat
                      (set to '$SINGLE_PART')
+	TRAYER       name of package to fill the menu bar, supported are
+	             'trayer' and 'stalonetray' (set to '$TRAYER')
 	TESTHOST     name of machine that should be tested for availability
                      (set to '$TESTHOST')
 	VERBOSE      increase amount of information that is forwarded to stdout
@@ -436,6 +439,8 @@ OPTIONS
                      sets the TASKS variable
 	--with-localepurge
                      will install the localepurge package
+	--trayer <trayer>
+                     sets the TRAYER variable
 	--bootstrapper (debootstrap|cdebootstrap)
                      sets the BOOTSTRAPPER variable
 
@@ -1657,6 +1662,11 @@ do
 			assignNumeric="true"
 			assignVariablename="SD_SWAP_SIZE"
 			;;
+	         "--trayer")
+			assignParametername="$i"
+			assignVariablename="TRAYER"
+			assignRegex='^(trayer|stalonetray)$'
+			;;
 		 "--with-localepurge")
 			LOCALEPURGE="true"
 			;;

-- 
Various non-packaged files