[maemo-commits] [maemo-commits] r13908 - projects/haf/trunk/hildon-desktop/debian

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-19 13:01:43 +0300 (Wed, 19 Sep 2007)
New Revision: 13908

Modified:
   projects/haf/trunk/hildon-desktop/debian/changelog
   projects/haf/trunk/hildon-desktop/debian/hildon-desktop.init
Log:

hildon-desktop (1:0.0.36-3) feisty; urgency=low

  * make startup sript scratchbox-friendly. Fixes: MB#1747

 -- Johan Bilien <johan.bilien at nokia.com>  Wed, 19 Sep 2007 13:00:37 +0300



Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2007-09-19 08:05:14 UTC (rev 13907)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2007-09-19 10:01:43 UTC (rev 13908)
@@ -1,3 +1,9 @@
+hildon-desktop (1:0.0.36-3) feisty; urgency=low
+
+  * make startup sript scratchbox-friendly. Fixes: MB#1747
+
+ -- Johan Bilien <johan.bilien at nokia.com>  Wed, 19 Sep 2007 13:00:37 +0300
+
 hildon-desktop (1:0.0.36-2) sardine; urgency=low
 
   * debian/config/applications.menu: some adjustment

Modified: projects/haf/trunk/hildon-desktop/debian/hildon-desktop.init
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/hildon-desktop.init	2007-09-19 08:05:14 UTC (rev 13907)
+++ projects/haf/trunk/hildon-desktop/debian/hildon-desktop.init	2007-09-19 10:01:43 UTC (rev 13908)
@@ -1,14 +1,25 @@
 #! /bin/sh
 
 SCRIPT=/etc/osso-af-init/hildon-desktop.sh
+SU=`which su`
 
+if [ -e /etc/osso-af-init/af-defines.sh ]
+then
+	source /etc/osso-af-init/af-defines.sh
+fi
+
+if [ "x${SU}" != "x" ]
+then
+	SUUSER="${SU} - user"
+fi
+
 case "$1" in
 start)
-        su - user $SCRIPT start
+        $SUUSER $SCRIPT start
 	sleep 8
         ;;
 
-stop)   su - user $SCRIPT stop
+stop)   $SUUSER $SCRIPT stop
         ;;
 restart)
         echo "$0: not implemented"