From 87a8619e34d271c918869fa19629f2be6deb0c38 Mon Sep 17 00:00:00 2001 From: Leif Madsen Date: Thu, 5 May 2011 15:06:59 +0000 Subject: Merged revisions 317104 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r317104 | lmadsen | 2011-05-05 11:04:24 -0400 (Thu, 05 May 2011) | 15 lines 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/trunk@317105 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- contrib/scripts/safe_asterisk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk index 61290906b..2adb0c5c4 100644 --- a/contrib/scripts/safe_asterisk +++ b/contrib/scripts/safe_asterisk @@ -47,7 +47,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 -- cgit v1.2.3