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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit c629b4d6a3fc36384161f1fb6c286cbd9f0f5c4e
Author: Steffen Moeller <moeller at debian.org>
Date:   Tue Sep 1 19:39:55 2009 +0200

    Omitting invocation of zhone from .xsession
    
    if not installed

diff --git a/install.sh b/install.sh
index d2ccc5c..58c67bb 100755
--- a/install.sh
+++ b/install.sh
@@ -977,7 +977,6 @@ __END_CHROOT__
 	echo -n "* Zhone GUI: "
 	if [ "$ZHONE" = true ]; then
 		if ! chroot "$INST_DIR" apt-get $APT_OPTIONS install zhone; then
-			ZHONE=false
 			echo "[failed - check pkg-fso mailing list]"
 		else
 			echo "[ok]"
@@ -1225,19 +1224,21 @@ __END__
 	chroot "$INST_DIR" apt-get $APT_OPTIONS install dash
 
 	echo " * Installing /root/.xsession"
-	cat > "$INST_DIR/root/.xsession" <<EOXSESSION
+	cat > "$INST_DIR"/root/.xsession <<EOXSESSION
 #!/bin/sh
 stalonetray &
 openmoko-panel-plugin &
 EOXSESSION
 
-	if [ "true" = "$ZHONE" ]; then
-		cat >> "$INST_DIR/root/.xsession" <<EOXSESSION
+	if [ -x "$INST_DIR"/usr/bin/zhone ]; then
+		cat >> "$INST_DIR"/root/.xsession <<EOXSESSION
 zhone &
 EOXSESSION
+	else
+		echo "   Not finding zhone application to autostart - omitted"
 	fi
 
-	cat >> "$INST_DIR/root/.xsession" <<EOXSESSION
+	cat >> "$INST_DIR"/root/.xsession <<EOXSESSION
 exec matchbox-window-manager -use_titlebar no -use_cursor no
 EOXSESSION
 
@@ -1245,7 +1246,7 @@ EOXSESSION
         #        put back on when the problems on .xsession-errors
 	#        have been resolved.
 	echo " * Installing /root/.panel-pluginrc"
-	cat > $INST_DIR/root/.panel-pluginrc <<EOPANELPLUGIN
+	cat > "$INST_DIR"/root/.panel-pluginrc <<EOPANELPLUGIN
 [main]
 plugins = buttons, gsm, wifi, gps, keyboard, brightness, screenlock, bluetooth
 EOPANELPLUGIN

-- 
Various non-packaged files