From f6c70ea327a83f77acbca14bca32f262e6b3a098 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 21 Sep 2009 14:42:20 -0400
Subject: [PATCH] have to provide full path for daemons

---
 scripts/getvaliddaemons.php | 22 +++++++++++-----------
 scripts/startdaemons.sh     |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 92edacfd3c..684799a0ee 100755
--- 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 298162673c..5fb75414d3 100755
--- 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