[PC-BSD Commits] r3068 - in pcbsd/trunk/system-overlay/PCBSD/xorg-gui: bin cardDetect

[svn at pcbsd.org]

Author: kris
Date: 2008-12-12 09:05:28 -0800 (Fri, 12 Dec 2008)
New Revision: 3068

Modified:
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/x_config.sh
Log:

Updated the xorg-gui tool to use the /PCBSD/local LOCALBASE instead



Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh	2008-12-12 16:36:22 UTC (rev 3067)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh	2008-12-12 17:05:28 UTC (rev 3068)
@@ -8,7 +8,7 @@
 # Configuration Settings
 
 # Set all our path variables
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin:/usr/local/kde4/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin:/usr/local/kde4/bin:/PCBSD/local/bin:/PCBSD/local/sbin:/PCBSD/local/kde4/bin"
 export PATH
 
 # Set the home directory for startx to run properly
@@ -177,18 +177,17 @@
  echo '#!/bin/sh
 
 # Set all our path variables
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin:/us
-r/local/kde4/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin:/usr/local/kde4/bin:/PCBSD/local/bin:/PCBSD/local/sbin:/PCBSD/local/kde4/bin"
 export PATH
 
 touch /PCBSD/xorg-gui/.xstartupsuccess
-/usr/local/bin/fluxbox &
+/PCBSD/local/bin/fluxbox &
 PID=$!
-/usr/local/kde4/bin/kdialog --msgbox "The previous attempt failed, please check your settings and try again!"
+/PCBSD/local/kde4/bin/kdialog --msgbox "The previous attempt failed, please check your settings and try again!"
 /PCBSD/xorg-gui/bin/XGUI
 if [ "$?" = "1" ]
 then
- /usr/local/kde4/bin/kdialog --msgbox "PC-BSD will now load using the default resolution."
+ /PCBSD/local/kde4/bin/kdialog --msgbox "PC-BSD will now load using the default resolution."
  echo "Canceled" > /PCBSD/xorg-gui/.canceled
 fi
 kill -9 ${PID}
@@ -201,17 +200,16 @@
  echo '#!/bin/sh
 
 # Set all our path variables
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin:/us
-r/local/kde4/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/bin:/usr/local/sbin:/usr/local/kde4/bin:/PCBSD/local/bin:/PCBSD/local/sbin:/PCBSD/local/kde4/bin"
 export PATH
 
 touch /PCBSD/xorg-gui/.xstartupsuccess
-/usr/local/bin/fluxbox &
+/PCBSD/local/bin/fluxbox &
 PID=$!
 /PCBSD/xorg-gui/bin/XGUI
 if [ "$?" = "1" ]
 then
- /usr/local/kde4/bin/kdialog --msgbox "PC-BSD will now load using the default resolution."
+ /PCBSD/local/kde4/bin/kdialog --msgbox "PC-BSD will now load using the default resolution."
  echo "Canceled" > /PCBSD/xorg-gui/.canceled
 fi
 
@@ -221,7 +219,7 @@
  ls /dev/nvidiactl* >/dev/null
  if [ "$?" != "0" ]
  then
-   /usr/local/kde4/bin/kdialog --msgbox "The system will install the NVIDIA kernel module. You may be asked to confirm the resolution after a reboot is performed."
+   /PCBSD/local/kde4/bin/kdialog --msgbox "The system will install the NVIDIA kernel module. You may be asked to confirm the resolution after a reboot is performed."
    touch /PCBSD/xorg-gui/.nvidiareboot
    touch /PCBSD/xorg-gui/.rerunxsetup
  fi
@@ -238,7 +236,7 @@
  echo "Please wait... Starting X..." >/dev/console
  sleep 1
  # Start the X gui
- /usr/local/bin/startx 2>>${XLOG}
+ /PCBSD/local/bin/startx 2>>${XLOG}
 
 # if the user chose an nvidia driver and we need to reboot, do it
 if [ -e "/PCBSD/xorg-gui/.nvidiareboot" ]
@@ -273,7 +271,7 @@
 
 ##### Create the xinitrc file
 echo '#!/bin/sh
-/usr/local/bin/fluxbox &
+/PCBSD/local/bin/fluxbox &
 PID=$!
 /PCBSD/xorg-gui/bin/XGUI -test
 if [ "${?}" = "0" ]
@@ -286,7 +284,7 @@
 
 echo "Please wait... Starting X..." >/dev/console
 sleep 1
-/usr/local/bin/startx 2>>${XLOG}
+/PCBSD/local/bin/startx 2>>${XLOG}
 
 fi
 

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/x_config.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/x_config.sh	2008-12-12 16:36:22 UTC (rev 3067)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/x_config.sh	2008-12-12 17:05:28 UTC (rev 3068)
@@ -22,7 +22,7 @@
 	cp ${XFREE_VMWARE} ${XFREE_NEWCONF}
 else
         # configuring X automatically
-	/usr/local/bin/X -configure >/dev/null 2>&1
+	/PCBSD/local/bin/X -configure >/dev/null 2>&1
 fi
 
 X_MON=`/usr/bin/sed -n '/^Section "Monitor"$/,/^EndSection$/ p' $XFREE_NEWCONF`