[PC-BSD Commits] r7211 - pcbsd/current/system-overlay/usr/PCBSD/bin

[svn at pcbsd.org]

Author: kris
Date: 2010-07-14 11:50:06 -0700 (Wed, 14 Jul 2010)
New Revision: 7211

Removed:
   pcbsd/current/system-overlay/usr/PCBSD/bin/CrashHandler
   pcbsd/current/system-overlay/usr/PCBSD/bin/rerunXsetup.sh
Modified:
   pcbsd/current/system-overlay/usr/PCBSD/bin/pdm
Log:

Cleanup PCBSD/bin



Modified: pcbsd/current/system-overlay/usr/PCBSD/bin/pdm
===================================================================
--- pcbsd/current/system-overlay/usr/PCBSD/bin/pdm	2010-07-14 18:47:17 UTC (rev 7210)
+++ pcbsd/current/system-overlay/usr/PCBSD/bin/pdm	2010-07-14 18:50:06 UTC (rev 7211)
@@ -7,15 +7,6 @@
 PATH="${PATH}:/usr/local/bin:/usr/local/sbin:/usr/local/kde4/bin"
 export PATH
 
-# Check if we need to add our KDEDIRS variable to startkde4
-#grep ^KDEDIRS= /usr/local/kde4/bin/startkde >/dev/null 2>/dev/null
-#if [ "$?" != "0" ]
-#then
-#  awk '{sub(/# When the/,"KDEDIRS=\"`kde4-config --prefix`:`kde-config --prefix`:/Programs/kde\" ; export KDEDIRS\n\n# When the");print}' < /usr/local/kde4/bin/startkde >/tmp/$$.awk
-#  mv /tmp/$$.awk /usr/local/kde4/bin/startkde
-#  chmod 755 /usr/local/kde4/bin/startkde
-#fi
-
 setup_xorg() {
 	/usr/PCBSD/xorg-gui/bin/rundetect.sh
 	rm -f /usr/PCBSD/conf/.runxsetup
@@ -24,14 +15,14 @@
 setup_xvesa() {
 	echo "Using failsafe VESA 1024x768 mode..." >/dev/console
 	mv /etc/X11/xorg.conf /etc/X11/xorg.conf.preVesa.backup
-	cp /usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat /etc/X11/xorg.conf
+	cp /usr/local/share/xorg-gui/cardDetect/XF86Config.compat /etc/X11/xorg.conf
 }
 
 # Check if we are going to re-run the display setup wizard
 y=`kenv runwiz`
 if [ $? -eq 0 ]; then
    if [ "$y" = "YES" ] ; then
-     touch /usr/PCBSD/conf/.runxsetup
+     touch /tmp/.runxsetup
    fi
    kenv -u runwiz
 fi
@@ -73,7 +64,7 @@
 		setup_xvesa
 	fi
 
-	if [ -e "/usr/PCBSD/conf/.runxsetup" ]; then
+	if [ -e "/tmp/.runxsetup" ]; then
 	    	setup_xorg
 	else
 		exec /usr/local/kde4/bin/kdm "$@"