From: Leif Madsen Date: Thu, 5 May 2011 14:56:52 +0000 (+0000) Subject: Merged revisions 317102 via svnmerge from X-Git-Tag: 1.6.2.19-rc1~3^2~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57316976758d73a2e9c6ab0dbb8dc032d0318c86;p=thirdparty%2Fasterisk.git Merged revisions 317102 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r317102 | lmadsen | 2011-05-05 10:54:46 -0400 (Thu, 05 May 2011) | 8 lines Disable console colourization inside safe_asterisk checks. (closes issue #19213) Reported by: lefoyer Patches: issue19213_strip_color_in_safe_asterisk-svn.patch uploaded by wdoekes (license 717) Tested by: wdoekes, lefoyer ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@317103 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk index 96333e4a89..61c258674d 100644 --- a/contrib/scripts/safe_asterisk +++ b/contrib/scripts/safe_asterisk @@ -45,7 +45,7 @@ message() { # Check if Asterisk is already running. If it is, then bug out, because # starting safe_asterisk when Asterisk is running is very bad. -VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'` +VERSION=`${ASTSBINDIR}/asterisk -nrx 'core show version'` if test "`echo $VERSION | cut -c 1-8`" = "Asterisk" ; then message "Asterisk is already running. $0 will exit now." exit 1