wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up console output for non-interactive mode (handy for batch setup scripts)

Browse Source
This commit is contained in:
Brion Vibber 2009-12-14 11:51:38 -08:00
parent a199bd808a
commit b93068083e
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/console.php
View File

@ -73,7 +73,7 @@ function read_input_line($prompt)
*/ */
function readline_emulation($prompt) function readline_emulation($prompt)
{ {
if(file_exists(trim(shell_exec('which bash')))) { if(CONSOLE_INTERACTIVE && file_exists(trim(shell_exec('which bash')))) {
$encPrompt = escapeshellarg($prompt); $encPrompt = escapeshellarg($prompt);
$command = "read -er -p $encPrompt && echo \"\$REPLY\""; $command = "read -er -p $encPrompt && echo \"\$REPLY\"";
$encCommand = escapeshellarg($command); $encCommand = escapeshellarg($command);
@ -103,7 +103,9 @@ function readline_emulation($prompt)
if (feof(STDIN)) { if (feof(STDIN)) {
return false; return false;
} }
print $prompt; if (CONSOLE_INTERACTIVE) {
print $prompt;
}
return fgets(STDIN); return fgets(STDIN);
} }
@ -123,13 +125,16 @@ function console_help()
print "Type ctrl+D or enter 'exit' to exit.\n"; print "Type ctrl+D or enter 'exit' to exit.\n";
} }
if (CONSOLE_INTERACTIVE) {
print "StatusNet interactive PHP console... type ctrl+D or enter 'exit' to exit.\n"; print "StatusNet interactive PHP console... type ctrl+D or enter 'exit' to exit.\n";
$prompt = common_config('site', 'name') . '> '; $prompt = common_config('site', 'name') . '> ';
}
while (!feof(STDIN)) { while (!feof(STDIN)) {
$line = read_input_line($prompt); $line = read_input_line($prompt);
if ($line === false) { if ($line === false) {
print "\n"; if (CONSOLE_INTERACTIVE) {
print "\n";
}
break; break;
} elseif ($line !== '') { } elseif ($line !== '') {
try { try {
@ -154,5 +159,7 @@ while (!feof(STDIN)) {
print get_class($e) . ": " . $e->getMessage() . "\n"; print get_class($e) . ": " . $e->getMessage() . "\n";
} }
} }
print "\n"; if (CONSOLE_INTERACTIVE) {
print "\n";
}
} }