diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-06 23:23:30 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-06 23:23:30 -0800 |
| commit | a55939f3b1540cf86b6edcf4f0c8ff79fb5f6a20 (patch) | |
| tree | b8ed9dc90ba728e36ca3ca77bed71f45a77d6dd4 /scripts | |
| parent | e1c7851a067d4d8201126816884b9992720010f5 (diff) | |
| parent | 5d13126c88a8143a1628cc52c2dae4581f134273 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/console.php | 2 | ||||
| -rwxr-xr-x | scripts/stopdaemons.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/console.php b/scripts/console.php index 329caf472..8b62a3a96 100755 --- a/scripts/console.php +++ b/scripts/console.php @@ -128,6 +128,8 @@ function console_help() if (CONSOLE_INTERACTIVE) { print "StatusNet interactive PHP console... type ctrl+D or enter 'exit' to exit.\n"; $prompt = common_config('site', 'name') . '> '; +} else { + $prompt = ''; } while (!feof(STDIN)) { $line = read_input_line($prompt); diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh index 90e7331ca..c790f1f34 100755 --- a/scripts/stopdaemons.sh +++ b/scripts/stopdaemons.sh @@ -25,7 +25,7 @@ DIR=`php $SDIR/getpiddir.php` for f in jabberhandler ombhandler publichandler smshandler pinghandler \ xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \ - twitterstatusfetcher synctwitterfriends pluginhandler; do + twitterstatusfetcher synctwitterfriends pluginhandler rsscloudhandler; do FILES="$DIR/$f.*.pid" for ff in "$FILES" ; do |