[maemo-commits] [maemo-commits] r11430 - projects/haf/trunk/osso-af-startup/services

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-05-03 17:53:25 +0300 (Thu, 03 May 2007)
New Revision: 11430

Modified:
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
Log:
more fixes for the case that the user is root


Modified: projects/haf/trunk/osso-af-startup/services/af-defines.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/af-defines.sh	2007-05-03 14:45:54 UTC (rev 11429)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2007-05-03 14:53:25 UTC (rev 11430)
@@ -118,14 +118,20 @@
   source_if_is keyboard.defs
 
   if [ -x /usr/bin/osso-product-info ]; then
-    sudo /usr/bin/osso-product-info 1> /tmp/.opi.tmp 2> /dev/null
+    if [ "x$USER" = "xroot" ]; then
+      _SUDO=''
+    else
+      _SUDO='sudo'
+    fi
+    $_SUDO /usr/bin/osso-product-info 1> /tmp/.opi.tmp 2> /dev/null
     if [ -r /tmp/.opi.tmp ]; then
       VNAMES=`awk -F '=' '{print $1}' < /tmp/.opi.tmp`
       source /tmp/.opi.tmp
       export $VNAMES
       unset VNAMES
     fi
-    sudo rm -f /tmp/.opi.tmp
+    $_SUDO rm -f /tmp/.opi.tmp
+    unset _SUDO
   fi
 
   export AF_DEFINES_SOURCED=1