Merged revisions 307536 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r307536 | qwell | 2011-02-10 16:39:30 -0600 (Thu, 10 Feb 2011) | 22 lines Merged revisions 307535 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r307535 | qwell | 2011-02-10 16:35:49 -0600 (Thu, 10 Feb 2011) | 15 lines Merged revisions 307534 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r307534 | qwell | 2011-02-10 16:33:09 -0600 (Thu, 10 Feb 2011) | 8 lines Remove color when executing commands via a remote console. Essentially this makes '-x' imply '-n' on rasterisk. This was done in a different and incomplete way previously, which I'm reverting here. (issue #18776) Reported by: alecdavis ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@307537 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
ed5ddd667d
commit
7daf1af6b2
|
@ -66,7 +66,7 @@ case "$1" in
|
|||
start)
|
||||
# Check if Asterisk is already running. If it is, then bug out, because
|
||||
# starting up Asterisk when Asterisk is already running is very bad.
|
||||
VERSION=`${DAEMON} -rnx 'core show version' || ${TRUE}`
|
||||
VERSION=`${DAEMON} -rx 'core show version' || ${TRUE}`
|
||||
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
|
||||
echo "Asterisk is already running. $0 will exit now."
|
||||
exit 1
|
||||
|
|
|
@ -3321,7 +3321,7 @@ int main(int argc, char *argv[])
|
|||
ast_clear_flag(&ast_options, AST_OPT_FLAG_FORCE_BLACK_BACKGROUND);
|
||||
break;
|
||||
case 'x':
|
||||
ast_set_flag(&ast_options, AST_OPT_FLAG_EXEC);
|
||||
ast_set_flag(&ast_options, AST_OPT_FLAG_EXEC | AST_OPT_FLAG_NO_COLOR);
|
||||
xarg = ast_strdupa(optarg);
|
||||
break;
|
||||
case '?':
|
||||
|
|
Reference in New Issue