have to provide full path for daemons

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 92edacfd3c1e6a9a698fa087b958ce95dcd6b9ad..684799a0ee40e3421c0fe679cd3190d1aef25265 100755 (executable)
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -38,23 +38,23 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 $daemons = array();
 
 if(common_config('xmpp','enabled')) {
-    $daemons[] = 'xmppdaemon.php';
-    $daemons[] = 'jabberqueuehandler.php';
-    $daemons[] = 'publicqueuehandler.php';
-    $daemons[] = 'xmppconfirmhandler.php';
+    $daemons[] = INSTALLDIR.'/scripts/xmppdaemon.php';
+    $daemons[] = INSTALLDIR.'/scripts/jabberqueuehandler.php';
+    $daemons[] = INSTALLDIR.'/scripts/publicqueuehandler.php';
+    $daemons[] = INSTALLDIR.'/scripts/xmppconfirmhandler.php';
 }
 if(common_config('twitterbridge','enabled')) {
-    $daemons[] = 'twitterstatusfetcher.php';
+    $daemons[] = INSTALLDIR.'/scripts/twitterstatusfetcher.php';
 }
-$daemons[] = 'ombqueuehandler.php';
+$daemons[] = INSTALLDIR.'/scripts/ombqueuehandler.php';
 if (common_config('twitter', 'enabled')) {
-    $daemons[] = 'twitterqueuehandler.php';
-    $daemons[] = 'synctwitterfriends.php';
+    $daemons[] = INSTALLDIR.'/scripts/twitterqueuehandler.php';
+    $daemons[] = INSTALLDIR.'/scripts/synctwitterfriends.php';
 }
-$daemons[] = 'facebookqueuehandler.php';
-$daemons[] = 'pingqueuehandler.php';
+$daemons[] = INSTALLDIR.'/scripts/facebookqueuehandler.php';
+$daemons[] = INSTALLDIR.'/scripts/pingqueuehandler.php';
 if (common_config('sms', 'enabled')) {
-    $daemons[] = 'smsqueuehandler.php';
+    $daemons[] = INSTALLDIR.'/scripts/smsqueuehandler.php';
 }
 
 if (Event::handle('GetValidDaemons', array(&$daemons))) {

diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 298162673c5a80b822e31825b6d39fdcaee2bf81..5fb75414d33322292682c09b91b83c71205fb11d 100755 (executable)
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -40,7 +40,7 @@ DAEMONS=`php $DIR/getvaliddaemons.php $ARGSG`
 for f in $DAEMONS; do
 
          printf "Starting $f...";
-        php $DIR/$f $ARGSD
+        php $f $ARGSD
         printf "DONE.\n"
 
 done