[PC-BSD Commits] r4008 - in pcbsd/trunk/system-overlay/usr/PCBSD: Scripts Scripts/Components Services/acpinotebook Services/hplip SystemUpdater/bin bin local/etc/rc.d local/kde4/share/applications/kde4 local/kde4/share/applnk/.hidden local/share/applnk/.hidden xorg-gui/bin xorg-gui/conf xorg-gui/templates/scripts
svn at pcbsd.org
svn at pcbsd.org
Fri May 29 08:05:33 PDT 2009
Author: kris
Date: 2009-05-29 08:05:30 -0700 (Fri, 29 May 2009)
New Revision: 4008
Modified:
pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/CheckPBIUpdates.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/Components/install-component.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/changeportdb.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/checkXloader.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/fbsd-update.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/installPatch.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/registerPatch.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/runpbi.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/system-stop.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/disable.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/enable.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/isEnabled.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/isRunning.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/restart.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/service-config.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/start.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/stop.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/disable.sh
pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/enable.sh
pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/SystemUpdater.sh
pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdates.sh
pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh
pcbsd/trunk/system-overlay/usr/PCBSD/bin/CrashHandler
pcbsd/trunk/system-overlay/usr/PCBSD/bin/PBIUpdater
pcbsd/trunk/system-overlay/usr/PCBSD/bin/PCBSDUpdater
pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm
pcbsd/trunk/system-overlay/usr/PCBSD/bin/rerunXsetup.sh
pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/pcbsdinit
pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/snddetect
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdmakeports.desktop
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdpbu.desktop
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdrunports.desktop
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdxsetup.desktop
pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applnk/.hidden/pbistart.desktop
pcbsd/trunk/system-overlay/usr/PCBSD/local/share/applnk/.hidden/pbistart.desktop
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/bin/setupconf.sh
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/ttys.normal
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/README
pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/nvidia.sh
Log:
Finished up last of the usr/PCBSD/local switch in trunk
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/CheckPBIUpdates.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/CheckPBIUpdates.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/CheckPBIUpdates.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,16 +1,16 @@
#!/bin/sh
# PBI Update Checker Script
-# Usage "/PCBSD/Scripts/CheckPBIUpdates.sh" <Progdir>
+# Usage "/usr/PCBSD/Scripts/CheckPBIUpdates.sh" <Progdir>
# I.E: CheckPBIUpdates.sh TestProg1.0 will check the
# directory /Programs/TestProg1.0 for updates
# Returns 1 if updates are available, 0 if PBI is up to date
###################################################################
# The wget binary
-WGET="/PCBSD/bin/wget"
+WGET="/usr/PCBSD/bin/wget"
# Where to save the tmp download file
-UPFILE="/PCBSD/tmp/PBIUpdateCheck";
+UPFILE="/usr/PCBSD/tmp/PBIUpdateCheck";
###############################################################
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/Components/install-component.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/Components/install-component.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/Components/install-component.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -7,14 +7,14 @@
MEDIA="${2}"
# Start by sourcing our config file for this component
-. /PCBSD/Components/${COMPONENT}/pkg-config.sh
+. /usr/PCBSD/Components/${COMPONENT}/pkg-config.sh
# Set our variables
#############################################################################
CDMNT="/tmp/pcbsdcdmnt"
MNTLOC=""
-FILEDIR="/PCBSD/tmp"
+FILEDIR="/usr/PCBSD/tmp"
# Network Variables
ARCH="`uname -m`"
@@ -73,7 +73,7 @@
umount -f ${CDMNT}
# Now start the install
- /PCBSD/Components/${COMPONENT}/install.sh ${FILEDIR}
+ /usr/PCBSD/Components/${COMPONENT}/install.sh ${FILEDIR}
# Do any cleanup of the old packages now
rm ${FILEDIR}/${PACKAGE} >/dev/null 2>/dev/null
@@ -139,7 +139,7 @@
if [ "${FOUND}" = "1" ]
then
# Now start the install
- /PCBSD/Components/${COMPONENT}/install.sh ${FILEDIR}
+ /usr/PCBSD/Components/${COMPONENT}/install.sh ${FILEDIR}
# Do any cleanup of the old packages now
rm ${FILEDIR}/${PACKAGE} >/dev/null 2>/dev/null
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/changeportdb.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/changeportdb.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/changeportdb.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -3,13 +3,13 @@
# the default PCBSD localbase and its ports
############################################################################
-setenv PKG_DBDIR /PCBSD/var/db
-setenv PORT_DBDIR /PCBSD/var/db
+setenv PKG_DBDIR /usr/PCBSD/var/db/pkg
+setenv PORT_DBDIR /usr/PCBSD/var/db/pkg
clear
echo "Set the following variables:"
-echo " PKG_DBDIR=/PCBSD/var/db"
-echo " PORT_DBDIR=/PCBSD/var/db"
+echo " PKG_DBDIR=/usr/PCBSD/var/db/pkg"
+echo " PORT_DBDIR=/usr/PCBSD/var/db/pkg"
echo " "
echo "WARNING! Modifying PC-BSD base packages could render the system in-operable!"
echo "You will need to edit /etc/make.conf and uncomment the LOCALBASE and LDCONFIG variables as well"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/checkXloader.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/checkXloader.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/checkXloader.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -5,12 +5,12 @@
FOUND="$?"
if [ "$FOUND" = "0" ]
then
- cp /PCBSD/xorg-gui/conf/ttys.xsetup /etc/ttys
+ cp /usr/PCBSD/xorg-gui/conf/ttys.xsetup /etc/ttys
exit 0
fi
-if [ -e "/PCBSD/xorg-gui/.rerunxsetup" ]
+if [ -e "/usr/PCBSD/xorg-gui/.rerunxsetup" ]
then
- cp /PCBSD/xorg-gui/conf/ttys.xsetup /etc/ttys
+ cp /usr/PCBSD/xorg-gui/conf/ttys.xsetup /etc/ttys
exit 0
fi
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/fbsd-update.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/fbsd-update.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/fbsd-update.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -2,10 +2,10 @@
# Script to check if a freebsd-update needs to be run at startup
##########################################################################
-if [ -e "/PCBSD/conf/freebsd-update-enable" ]
+if [ -e "/usr/PCBSD/conf/freebsd-update-enable" ]
then
-freebsd-update fetch >/PCBSD/tmp/fbsd-update-log
-freebsd-update install >>/PCBSD/tmp/fbsd-update-log
+freebsd-update fetch >/usr/PCBSD/tmp/fbsd-update-log
+freebsd-update install >>/usr/PCBSD/tmp/fbsd-update-log
fi
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/installPatch.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/installPatch.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/installPatch.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,13 +1,13 @@
#!/bin/sh
# Remove the tmpdir if it exists
-rm -rf /PCBSD/tmp/patchdir >/dev/null 2>/dev/null
+rm -rf /usr/PCBSD/tmp/patchdir >/dev/null 2>/dev/null
# Change Directories
-mkdir /PCBSD/tmp/patchdir >/dev/null 2>/dev/null
+mkdir -p /usr/PCBSD/tmp/patchdir >/dev/null 2>/dev/null
# Change Directories
-cd /PCBSD/tmp/patchdir
+cd /usr/PCBSD/tmp/patchdir
# Untar the patch file
tar xvjf $1 >/dev/null 2>/dev/null
@@ -18,13 +18,13 @@
fi
# Make it executable
-chmod 755 /PCBSD/tmp/patchdir/PBUPatch.sh
+chmod 755 /usr/PCBSD/tmp/patchdir/PBUPatch.sh
# Run the patch script file
-/PCBSD/tmp/patchdir/PBUPatch.sh >&1 2>&1
+/usr/PCBSD/tmp/patchdir/PBUPatch.sh >&1 2>&1
# Delete the tmp dir
-rm -rf /PCBSD/tmp/patchdir
+rm -rf /usr/PCBSD/tmp/patchdir
exit 0
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/registerPatch.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/registerPatch.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/registerPatch.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,15 +1,15 @@
#!/bin/sh
# Source the main INI file
-#. /PCBSD/conf/pcbsd.ini
+#. /usr/PCBSD/conf/pcbsd.ini
PCBSDVER="`PBReg get /PC-BSD/Version`"
# Make the patch Directory
-mkdir /PCBSD/Patches/${PCBSDVER}/${1}
+mkdir /usr/PCBSD/Patches/${PCBSDVER}/${1}
# Move the .pbu file to that dir
-mv /PCBSD/tmp/${1}.pbu /PCBSD/Patches/${PCBSDVER}/${1}/
+mv /usr/PCBSD/tmp/${1}.pbu /usr/PCBSD/Patches/${PCBSDVER}/${1}/
# Remove the tarball
rm ${2}
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/runpbi.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/runpbi.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/runpbi.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,6 +1,6 @@
#!/bin/sh
-. /PCBSD/LANGS/PCBSDLANG
+. /usr/PCBSD/LANGS/PCBSDLANG
file "$1" | grep ELF
test="$?"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/system-stop.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/system-stop.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Scripts/system-stop.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -3,8 +3,8 @@
##############################################################################
# Update the linker.hints file
-/PCBSD/Scripts/UpdateHints.sh
+/usr/PCBSD/Scripts/UpdateHints.sh
echo "Cleaning PBI Logs"
-/PCBSD/Scripts/cleanpbilog.sh
+/usr/PCBSD/Scripts/cleanpbilog.sh
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/disable.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/disable.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/disable.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -2,7 +2,7 @@
# This script enables the service at bootup
# Return 0 on success, or 1 on failure.
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
if [ "$SELECTED_ACPI" != "" ];
then
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/enable.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/enable.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/enable.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -2,7 +2,7 @@
# This script enables the service at bootup
# Return 0 on success, or 1 on failure.
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
if [ "$SELECTED_ACPI" != "" ];
then
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/isEnabled.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/isEnabled.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/isEnabled.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -2,7 +2,7 @@
# This script enables the service at bootup
# Return 0 on success, or 1 on failure.
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
if [ "$SELECTED_ACPI" != "" ];
then
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/isRunning.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/isRunning.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/isRunning.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -2,7 +2,7 @@
# This script checks if a service is currently running
# Return a "0" if the service is running, or a "1" if it is stopped
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
if [ "$SELECTED_ACPI" != "" ];
then
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/restart.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/restart.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/restart.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -2,7 +2,7 @@
# This script restarts a currently running service
# Return a "0" on success, or a "1" on failure
-. /PCBSD/Services/acpinotebook/stop.sh
-. /PCBSD/Services/acpinotebook/start.sh
+. /usr/PCBSD/Services/acpinotebook/stop.sh
+. /usr/PCBSD/Services/acpinotebook/start.sh
return 0
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/service-config.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/service-config.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/service-config.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,6 +1,6 @@
#!/bin/sh
-. /PCBSD/Services/acpinotebook/selected-acpi.sh
+. /usr/PCBSD/Services/acpinotebook/selected-acpi.sh
ALLOWED_ACPI="asus fujitsu ibm panasonic sony toshiba"
@@ -25,7 +25,7 @@
SELECTED_ACPI=\"${SELECTED_ACPI}\"
INITED_ACPI=\"TRUE\"
-" > /PCBSD/Services/acpinotebook/selected-acpi.sh
+" > /usr/PCBSD/Services/acpinotebook/selected-acpi.sh
if [ "$SELECTED_ACPI" = "" ];
then
@@ -34,7 +34,7 @@
disableStart: YES
disableStop: YES
disableRestart: YES
-" >> /PCBSD/Services/acpinotebook/service.cfg
+" >> /usr/PCBSD/Services/acpinotebook/service.cfg
fi
fi
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/start.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/start.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/start.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -2,7 +2,7 @@
# This script starts a stopped service
# Return 0 on success, or "1" on failure
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
if [ "$SELECTED_ACPI" != "" ];
then
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/stop.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/stop.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/acpinotebook/stop.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -2,7 +2,7 @@
# This script starts a stopped service
# Return 0 on success, or "1" on failure
-. /PCBSD/Services/acpinotebook/service-config.sh
+. /usr/PCBSD/Services/acpinotebook/service-config.sh
if [ "$SELECTED_ACPI" != "" ];
then
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/disable.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/disable.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/disable.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -2,7 +2,7 @@
# This script disables the service at bootup
# Return 0 on success, or 1 on failure.
-/PCBSD/Services/hplip/stop.sh
+/usr/PCBSD/Services/hplip/stop.sh
kldload ulpt
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/enable.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/enable.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/hplip/enable.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -11,6 +11,6 @@
cat /boot/loader.conf | grep -v "ulpt_load=" >/tmp/loader.new
mv /tmp/loader.new /boot/loader.conf
-/PCBSD/Services/hplip/start.sh
+/usr/PCBSD/Services/hplip/start.sh
return 0
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/SystemUpdater.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/SystemUpdater.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/SystemUpdater.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -6,7 +6,7 @@
LANG="`grep ^Language= ~/.kde/share/config/kdeglobals | cut -d "=" -f2`"
export LANG
-/PCBSD/SystemUpdater/bin/SystemUpdater
+/usr/PCBSD/SystemUpdater/bin/SystemUpdater
sleep 8
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdates.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdates.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdates.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -10,7 +10,7 @@
fi
# Set the program location
-PROGDIR="/PCBSD/SystemUpdater" ; export PROGDIR
+PROGDIR="/usr/PCBSD/SystemUpdater" ; export PROGDIR
# Get the system version we are checking for updates to
SYSVER="${1}" ; export SYSVER
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -11,7 +11,7 @@
fi
# Set the program location
-PROGDIR="/PCBSD/SystemUpdater" ; export PROGDIR
+PROGDIR="/usr/PCBSD/SystemUpdater" ; export PROGDIR
# Get the system version we are checking for updates to
SYSVER="${1}" ; export SYSVER
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/bin/CrashHandler
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/bin/CrashHandler 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/bin/CrashHandler 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,4 +1,4 @@
#!/bin/sh
-. /PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
-LD_LIBRARY_PATH="/usr/local/MyPrograms/.libs/"; export LD_LIBRARY_PATH
-/PCBSD/bin/CrashHandler-bin $@
+. /usr/PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
+LD_LIBRARY_PATH="" ; export LD_LIBRARY_PATH
+/usr/PCBSD/bin/CrashHandler-bin $@
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/bin/PBIUpdater
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/bin/PBIUpdater 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/bin/PBIUpdater 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,3 +1,3 @@
#!/bin/sh
-. /PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
-/PCBSD/bin/PBIUpdater-bin
+. /usr/PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
+/usr/PCBSD/bin/PBIUpdater-bin
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/bin/PCBSDUpdater
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/bin/PCBSDUpdater 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/bin/PCBSDUpdater 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,4 +1,4 @@
#!/bin/sh
-. /PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
+. /usr/PCBSD/LANGS/PCBSDLANG >/dev/null 2>/dev/null
LD_LIBRARY_PATH="/usr/local/MyPrograms/.libs/"; export LD_LIBRARY_PATH
-/PCBSD/bin/PCBSDUpdater-bin $@
+/usr/PCBSD/bin/PCBSDUpdater-bin $@
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm 2009-05-29 15:05:30 UTC (rev 4008)
@@ -64,7 +64,7 @@
while
i=1
do
- if [ -e "/PCBSD/conf/.runxsetup" ]; then
+ if [ -e "/usr/PCBSD/conf/.runxsetup" ]; then
if [ ${xvesa} = "YES" ]; then
setup_xvesa
else
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/bin/rerunXsetup.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/bin/rerunXsetup.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/bin/rerunXsetup.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -5,7 +5,7 @@
then
echo "
-touch /PCBSD/conf/.runxsetup
+touch /usr/PCBSD/conf/.runxsetup
(sleep 5; killall -9 kdm-bin kdm kdeinit4 X) &" > /tmp/.killx
chmod 755 /tmp/.killx
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/pcbsdinit
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/pcbsdinit 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/pcbsdinit 2009-05-29 15:05:30 UTC (rev 4008)
@@ -18,12 +18,12 @@
pcbsd_start()
{
- /PCBSD/Scripts/system-start.sh
+ /usr/PCBSD/Scripts/system-start.sh
}
pcbsd_stop()
{
- /PCBSD/Scripts/system-stop.sh
+ /usr/PCBSD/Scripts/system-stop.sh
}
run_rc_command "$1"
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/snddetect
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/snddetect 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/etc/rc.d/snddetect 2009-05-29 15:05:30 UTC (rev 4008)
@@ -23,7 +23,7 @@
then
rm /tmp/unknownSound
fi
- /PCBSD/soundDetect/sound_detect
+ /usr/PCBSD/soundDetect/sound_detect
}
snddetect_stop()
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdmakeports.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdmakeports.desktop 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdmakeports.desktop 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
-Exec=/PCBSD/Scripts/runports.sh
-Icon=/PCBSD/images/runports.png
+Exec=/usr/PCBSD/Scripts/runports.sh
+Icon=/usr/PCBSD/images/runports.png
Type=Application
Name=Run Ports (root)
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdpbu.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdpbu.desktop 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdpbu.desktop 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Exec=/PCBSD/SystemUpdater/bin/SystemUpdaterTray
+Exec=/usr/PCBSD/SystemUpdater/bin/SystemUpdaterTray
Icon=preferences-desktop-notification
Type=Application
Name=Online Update Notifier
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdrunports.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdrunports.desktop 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdrunports.desktop 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
-Exec=/PCBSD/Scripts/runports.sh
-Icon=/PCBSD/images/runports.png
+Exec=/usr/PCBSD/Scripts/runports.sh
+Icon=/usr/PCBSD/images/runports.png
Type=Application
Name=Run Ports (user)
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdxsetup.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdxsetup.desktop 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applications/kde4/pcbsdxsetup.desktop 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Exec=/PCBSD/bin/rerunXsetup.sh
+Exec=/usr/PCBSD/bin/rerunXsetup.sh
Icon=preferences-desktop
Type=Application
GenericName=Display Setup Wizard
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applnk/.hidden/pbistart.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applnk/.hidden/pbistart.desktop 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/kde4/share/applnk/.hidden/pbistart.desktop 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=/PCBSD/Scripts/runpbi.sh
+Exec=/usr/PCBSD/Scripts/runpbi.sh
Icon=/Programs/.config/application.png
AllowAsDefault=true
MimeType=application/pbi
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/local/share/applnk/.hidden/pbistart.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/local/share/applnk/.hidden/pbistart.desktop 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/local/share/applnk/.hidden/pbistart.desktop 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=/PCBSD/Scripts/runpbi.sh
+Exec=/usr/PCBSD/Scripts/runpbi.sh
Icon=/Programs/.config/application.png
AllowAsDefault=true
MimeType=application/pbi
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/bin/setupconf.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/bin/setupconf.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/bin/setupconf.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -1,32 +1,32 @@
#!/bin/sh
# Source the settings file
-chmod 755 /PCBSD/xorg-gui/.xsettings.sh
-. /PCBSD/xorg-gui/.xsettings.sh
+chmod 755 /usr/PCBSD/xorg-gui/.xsettings.sh
+. /usr/PCBSD/xorg-gui/.xsettings.sh
# Set our port / pkg database dirs
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg" ; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg" ; export PORT_DBDIR
-TMPFILE="/PCBSD/xorg-gui/.xorg.conf.tmp"
+TMPFILE="/usr/PCBSD/xorg-gui/.xorg.conf.tmp"
# Get the real driver name and save the value from xorg-gui
SELDRIVER="${DRIVER}" ; export SELDRIVER
-grep "^${DRIVER}:" /PCBSD/xorg-gui/settings/alias.txt >/dev/null 2>/dev/null
+grep "^${DRIVER}:" /usr/PCBSD/xorg-gui/settings/alias.txt >/dev/null 2>/dev/null
if [ "$?" = "0" ]
then
- DRIVER=`cat /PCBSD/xorg-gui/settings/alias.txt | grep "^${DRIVER}:" | cut -d ":" -f 2`
+ DRIVER=`cat /usr/PCBSD/xorg-gui/settings/alias.txt | grep "^${DRIVER}:" | cut -d ":" -f 2`
export DRIVER
else
echo "Warning: Selected driver not found in alias.txt file..."
fi
# Check if the driver has a special header to use in place of the generic one
-if [ -e "/PCBSD/xorg-gui/templates/header/${DRIVER}.xorg.conf" ]
+if [ -e "/usr/PCBSD/xorg-gui/templates/header/${DRIVER}.xorg.conf" ]
then
- cp "/PCBSD/xorg-gui/templates/header/${DRIVER}.xorg.conf" $TMPFILE
+ cp "/usr/PCBSD/xorg-gui/templates/header/${DRIVER}.xorg.conf" $TMPFILE
else
- cp /PCBSD/xorg-gui/templates/header/xorg.conf.generic $TMPFILE
+ cp /usr/PCBSD/xorg-gui/templates/header/xorg.conf.generic $TMPFILE
fi
@@ -112,7 +112,7 @@
# Setup resolution modeline with GTF
XRES="`echo $RES | cut -d 'x' -f 1`"
YRES="`echo $RES | cut -d 'x' -f 2`"
-#/PCBSD/xorg-gui/bin/gtf $XRES $YRES $REFRESH >> $TMPFILE
+#/usr/PCBSD/xorg-gui/bin/gtf $XRES $YRES $REFRESH >> $TMPFILE
echo 'EndSection
@@ -180,7 +180,7 @@
# Copy over the defined template options for the specific driver
-cat /PCBSD/xorg-gui/templates/driver/${DRIVER}.template >>$TMPFILE
+cat /usr/PCBSD/xorg-gui/templates/driver/${DRIVER}.template >>$TMPFILE
# Check if we have a cardbus variable
if [ -e "/tmp/.cardbus" ]
@@ -304,9 +304,9 @@
# See if this driver needs any post-setup operations to run
-if [ -e "/PCBSD/xorg-gui/templates/scripts/${DRIVER}.sh" ]
+if [ -e "/usr/PCBSD/xorg-gui/templates/scripts/${DRIVER}.sh" ]
then
# We found the file, so run it
- sh "/PCBSD/xorg-gui/templates/scripts/${DRIVER}.sh" "${SELDRIVER}"
+ sh "/usr/PCBSD/xorg-gui/templates/scripts/${DRIVER}.sh" "${SELDRIVER}"
fi
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/ttys.normal
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/ttys.normal 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/conf/ttys.normal 2009-05-29 15:05:30 UTC (rev 4008)
@@ -41,7 +41,7 @@
ttyv5 "/usr/libexec/getty Pc" cons25 on secure
ttyv6 "/usr/libexec/getty Pc" cons25 on secure
ttyv7 "/usr/libexec/getty Pc" cons25 on secure
-ttyv8 "/PCBSD/bin/pdm" xterm on secure
+ttyv8 "/usr/PCBSD/bin/pdm" xterm on secure
# Serial terminals
# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
ttyd0 "/usr/libexec/getty std.9600" dialup off secure
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/README
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/README 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/README 2009-05-29 15:05:30 UTC (rev 4008)
@@ -4,4 +4,4 @@
This may include loading drivers, tweaking configs, etc.
The script name should match the corresponding entery in the drivers.txt and
-alias.txt files in /PCBSD/xorg-gui/settings/ directory.
+alias.txt files in /usr/PCBSD/xorg-gui/settings/ directory.
Modified: pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/nvidia.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/nvidia.sh 2009-05-29 14:46:36 UTC (rev 4007)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/xorg-gui/templates/scripts/nvidia.sh 2009-05-29 15:05:30 UTC (rev 4008)
@@ -4,8 +4,8 @@
# The selected driver version is set at $1
DRIVERVER="${1}"
-PKG_DBDIR="/PCBSD/var/db"; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db"; export PKG_DBDIR
+PKG_DBDIR="/usr/PCBSD/var/db/pkg"; export PKG_DBDIR
+PORT_DBDIR="/usr/PCBSD/var/db/pkg"; export PKG_DBDIR
#Check if the driver is already loaded
@@ -21,8 +21,8 @@
# Add the nvidia driver to the system
PKGNAME="`echo ${DRIVERVER} | sed -e 's|nvidia-|nvidia-driver-|'`"
-pkg_add -f /PCBSD/packages/${PKGNAME}*.tbz
-pkg_add -f /PCBSD/packages/nvidia-settings*.tbz
+pkg_add -f /usr/PCBSD/packages/${PKGNAME}*.tbz
+pkg_add -f /usr/PCBSD/packages/nvidia-settings*.tbz
#Check if the driver is already loaded
kldstat | grep nvidia >/dev/null 2>/dev/null
More information about the Commits
mailing list