[PC-BSD Commits] r6469 - in pcbsd-projects/warden: . scripts/rc.d

[svn at pcbsd.org]

Author: kris
Date: 2010-03-29 11:14:11 -0700 (Mon, 29 Mar 2010)
New Revision: 6469

Modified:
   pcbsd-projects/warden/scripts/rc.d/shutdown.sh
   pcbsd-projects/warden/scripts/rc.d/startup.sh
   pcbsd-projects/warden/scripts/rc.d/wardenrc
   pcbsd-projects/warden/warden.pro
Log:

Fixed up rc.d scripts to make port ready



Modified: pcbsd-projects/warden/scripts/rc.d/shutdown.sh
===================================================================
--- pcbsd-projects/warden/scripts/rc.d/shutdown.sh	2010-03-29 17:40:06 UTC (rev 6468)
+++ pcbsd-projects/warden/scripts/rc.d/shutdown.sh	2010-03-29 18:14:11 UTC (rev 6469)
@@ -2,10 +2,8 @@
 # Starts up the warden service
 ######################################################################
 
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin:/root/bin"
-
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="${1}"
 
 if [ -z "${PROGDIR}" ]
 then

Modified: pcbsd-projects/warden/scripts/rc.d/startup.sh
===================================================================
--- pcbsd-projects/warden/scripts/rc.d/startup.sh	2010-03-29 17:40:06 UTC (rev 6468)
+++ pcbsd-projects/warden/scripts/rc.d/startup.sh	2010-03-29 18:14:11 UTC (rev 6469)
@@ -2,10 +2,8 @@
 # Starts up the warden service
 ######################################################################
 
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin:/root/bin"
-
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="${1}"
 
 if [ -z "${PROGDIR}" ]
 then

Modified: pcbsd-projects/warden/scripts/rc.d/wardenrc
===================================================================
--- pcbsd-projects/warden/scripts/rc.d/wardenrc	2010-03-29 17:40:06 UTC (rev 6468)
+++ pcbsd-projects/warden/scripts/rc.d/wardenrc	2010-03-29 18:14:11 UTC (rev 6469)
@@ -19,13 +19,13 @@
 warden_start()
 {
   PROGDIR="`/usr/local/bin/pbreg get /PC-BSD/TheWarden/ProgDir`"
-  $PROGDIR/scripts/rc.d/startup.sh
+  $PROGDIR/scripts/rc.d/startup.sh "${PROGDIR}"
 }
 
 warden_stop()
 {
   PROGDIR="`/usr/local/bin/pbreg get /PC-BSD/TheWarden/ProgDir`"
-  $PROGDIR/scripts/rc.d/shutdown.sh
+  $PROGDIR/scripts/rc.d/shutdown.sh "${PROGDIR}"
 }
 
 run_rc_command "$1"

Modified: pcbsd-projects/warden/warden.pro
===================================================================
--- pcbsd-projects/warden/warden.pro	2010-03-29 17:40:06 UTC (rev 6468)
+++ pcbsd-projects/warden/warden.pro	2010-03-29 18:14:11 UTC (rev 6469)
@@ -19,5 +19,8 @@
 mkdirs.path=$${INSTALLDIR}/worlds
 mkdirs.extra=sh mkdirs.sh $${INSTALLDIR}
 
-INSTALLS+= scripts binscript conf binlink mkdirs
+rc.path=$${INSTALLDIR}/scripts/rc.d
+rc.extra=ln -fs $${INSTALLDIR}/scripts/rc.d/wardenrc /usr/local/etc/rc.d/wardenrc
 
+INSTALLS+= scripts binscript conf binlink mkdirs rc
+