[PC-BSD Commits] r15646 - in pcbsd/current/src-qt4/warden: . scripts scripts/rc.d src

[svn at pcbsd.org]

Author: kris
Date: 2012-02-29 15:49:52 +0000 (Wed, 29 Feb 2012)
New Revision: 15646

Modified:
   pcbsd/current/src-qt4/warden/scripts/init-warden.sh
   pcbsd/current/src-qt4/warden/scripts/rc.d/wardenrc
   pcbsd/current/src-qt4/warden/src/dialogwarden.h
   pcbsd/current/src-qt4/warden/src/src.pro
   pcbsd/current/src-qt4/warden/warden.pro
Log:

Change warden home to /usr/local/share/warden



Modified: pcbsd/current/src-qt4/warden/scripts/init-warden.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/init-warden.sh	2012-02-29 15:46:54 UTC (rev 15645)
+++ pcbsd/current/src-qt4/warden/scripts/init-warden.sh	2012-02-29 15:49:52 UTC (rev 15646)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Script which sets some inits some of the pbreg values that warden will be needing
 
-PROGDIR="/usr/local/warden"
+PROGDIR="/usr/local/share/warden"
 WORLDDIR="${PROGDIR}/worlds/defaultworld"
 JAILDIR="${PROGDIR}/jails"
 

Modified: pcbsd/current/src-qt4/warden/scripts/rc.d/wardenrc
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/rc.d/wardenrc	2012-02-29 15:46:54 UTC (rev 15645)
+++ pcbsd/current/src-qt4/warden/scripts/rc.d/wardenrc	2012-02-29 15:49:52 UTC (rev 15646)
@@ -18,13 +18,13 @@
 
 warden_start()
 {
-  PROGDIR="/usr/local/warden"
+  PROGDIR="/usr/local/share/warden"
   $PROGDIR/scripts/rc.d/startup.sh "${PROGDIR}"
 }
 
 warden_stop()
 {
-  PROGDIR="/usr/local/warden"
+  PROGDIR="/usr/local/share/warden"
   $PROGDIR/scripts/rc.d/shutdown.sh "${PROGDIR}"
 }
 

Modified: pcbsd/current/src-qt4/warden/src/dialogwarden.h
===================================================================
--- pcbsd/current/src-qt4/warden/src/dialogwarden.h	2012-02-29 15:46:54 UTC (rev 15645)
+++ pcbsd/current/src-qt4/warden/src/dialogwarden.h	2012-02-29 15:49:52 UTC (rev 15646)
@@ -2,7 +2,7 @@
 #ifndef DIALOGWARDEN_H
 #define DIALOGWARDEN_H
 
-#define WARDENDIR QString("/usr/local/warden")
+#define WARDENDIR QString("/usr/local/share/warden")
 
 #include "ui_dialogwarden.h"
 #include "dialogimport.h"

Modified: pcbsd/current/src-qt4/warden/src/src.pro
===================================================================
--- pcbsd/current/src-qt4/warden/src/src.pro	2012-02-29 15:46:54 UTC (rev 15645)
+++ pcbsd/current/src-qt4/warden/src/src.pro	2012-02-29 15:49:52 UTC (rev 15646)
@@ -23,6 +23,6 @@
 
 RESOURCES += warden.qrc
 
-target.path=/usr/local/warden/bin
+target.path=/usr/local/share/warden/bin
 
 INSTALLS+= target

Modified: pcbsd/current/src-qt4/warden/warden.pro
===================================================================
--- pcbsd/current/src-qt4/warden/warden.pro	2012-02-29 15:46:54 UTC (rev 15645)
+++ pcbsd/current/src-qt4/warden/warden.pro	2012-02-29 15:49:52 UTC (rev 15646)
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-INSTALLDIR=/usr/local/warden
+INSTALLDIR=/usr/local/share/warden
 
 SUBDIRS+=src