[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 1335d41029c3d14a73c075c4541c14ab0a73f93a
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Sep 20 12:43:34 2009 +0200

    cosmetics in source code

diff --git a/install.sh b/install.sh
index 7169b73..bb74a0c 100755
--- a/install.sh
+++ b/install.sh
@@ -91,10 +91,8 @@ MOUNT_PROC=true
 intern_instdir_already_present="" 
 intern_no_partitioning=""
 
-# cdebootstrap options
+# debootstrap and cdebootstrap options
 # with packages for a basic debian with network connectivity
-
-
 CDEBOOTSTRAP_FLAVOUR=minimal
 DEBOOTSTRAP_VARIANT=minbase
 CDEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/c/cdebootstrap/cdebootstrap-static_0.5.5_armel.deb
@@ -111,7 +109,7 @@ DEBIAN_EXTRA_PACKAGES=ifupdown,dropbear,udev,procps,netbase,vim-tiny,module-init
 # because of some apt-get bug, console-setup must be listed
 # before any other X.Org package, for more information see
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=435662#45
-FSO_PACKAGES="matchbox-window-manager fso-frameworkd fso-gpsd openmoko-panel-plugin dbus-x11 stalonetray fso-utils mtd-utils \
+FSO_PACKAGES="matchbox-window-manager fso-frameworkd fso-gpsd openmoko-panel-plugin dbus-x11 $TRAYER fso-utils mtd-utils \
 console-setup xserver-xorg-core xserver-xorg-video-fbdev xserver-xorg-input-tslib xterm xinit xfonts-base x11-xserver-utils"
 
 # well-suited software for the FreeRunner
@@ -1282,7 +1280,7 @@ __END__
 	echo " * Installing /root/.xsession"
 	cat > "$INST_DIR"/root/.xsession <<EOXSESSION
 #!/bin/sh
-stalonetray &
+$TRAYER &
 openmoko-panel-plugin &
 EOXSESSION
 
@@ -1298,10 +1296,12 @@ EOXSESSION
 exec matchbox-window-manager -use_titlebar no -use_cursor no
 EOXSESSION
 
-	cat >> "$INST_DIR"/root/.stalonetrayrc <<EOTRAYRC
+	if  [ "stalonetray" = "$TRAYER" ]; then
+		cat >> "$INST_DIR"/root/.stalonetrayrc <<EOTRAYRC
 # see /usr/share/doc/stalonetray/examples/stalonetrayrc.sample.gz
 # with ideas for the configuration.
 EOTRAYRC
+	fi
 
 	# FIXME: the battery is deconfigured and should be
 	#        put back on when the problems on .xsession-errors

-- 
Various non-packaged files