[PC-BSD Commits] r12746 - in pcbsd/current/system-overlay/usr: local/share/pcbsd/xstartup share/skel

[svn at pcbsd.org]

Author: kris
Date: 2011-09-11 12:49:08 -0700 (Sun, 11 Sep 2011)
New Revision: 12746

Modified:
   pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/checkwelcome.sh
   pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/life-preserver.sh
   pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/net-trays.sh
   pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/vkeyboard.sh
   pcbsd/current/system-overlay/usr/share/skel/.xprofile
Log:

Fix ibus enabling and how we run startup scripts



Modified: pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/checkwelcome.sh
===================================================================
--- pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/checkwelcome.sh	2011-09-11 19:38:45 UTC (rev 12745)
+++ pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/checkwelcome.sh	2011-09-11 19:49:08 UTC (rev 12746)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check if we need to show the welcome application
 
-if [ "`id -u`" = "0" ] ; then exit ; fi
+if [ "`id -u`" = "0" ] ; then return ; fi
 
 if [ ! -f "${HOME}/.config/hide-welcome" ] ; then
   (sleep 30 ; pc-welcome ) &

Modified: pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/life-preserver.sh
===================================================================
--- pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/life-preserver.sh	2011-09-11 19:38:45 UTC (rev 12745)
+++ pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/life-preserver.sh	2011-09-11 19:49:08 UTC (rev 12746)
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Start life-preserver with login
 
-if [ "`id -u`" = "0" ] ; then exit ; fi
+if [ "`id -u`" = "0" ] ; then return ; fi
 
 (sleep 10 ; sudo life-preserver -tray) &

Modified: pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/net-trays.sh
===================================================================
--- pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/net-trays.sh	2011-09-11 19:38:45 UTC (rev 12745)
+++ pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/net-trays.sh	2011-09-11 19:49:08 UTC (rev 12746)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Script to check if there are any wireless networks to display on the tray
 
-if [ "`id -u`" = "0" ] ; then exit ; fi
+if [ "`id -u`" = "0" ] ; then return ; fi
 
 ifconfig wlan0 >/dev/null 2>/dev/null
 if [ $? -eq 0 ] ; then

Modified: pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/vkeyboard.sh
===================================================================
--- pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/vkeyboard.sh	2011-09-11 19:38:45 UTC (rev 12745)
+++ pcbsd/current/system-overlay/usr/local/share/pcbsd/xstartup/vkeyboard.sh	2011-09-11 19:49:08 UTC (rev 12746)
@@ -3,7 +3,7 @@
 
 # See if we have a touch-screen auto-configured
 cat /etc/X11/xorg.conf | grep -q "Panel0" >/dev/null 2>/dev/null
-if [ $? -ne 0 ] ; then exit 0 ; fi
+if [ $? -ne 0 ] ; then return 0 ; fi
 
 if [ ! -e "$HOME/.florence.conf" ] ; then
   cp /usr/local/share/florence/florence.conf ${HOME}/.florence.conf   

Modified: pcbsd/current/system-overlay/usr/share/skel/.xprofile
===================================================================
--- pcbsd/current/system-overlay/usr/share/skel/.xprofile	2011-09-11 19:38:45 UTC (rev 12745)
+++ pcbsd/current/system-overlay/usr/share/skel/.xprofile	2011-09-11 19:49:08 UTC (rev 12746)
@@ -10,5 +10,5 @@
 # Check for any specific PC-BSD apps we need to start at login
 for i in `ls /usr/local/share/pcbsd/xstartup/*`
 do
-	if [ -x "${i}" ] ; then ${i} ; fi
+	if [ -x "${i}" ] ; then . ${i} ; fi
 done