diff options
| author | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-30 16:57:49 +0000 |
|---|---|---|
| committer | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-30 16:57:49 +0000 |
| commit | ed870e5775d2aa5a23fcbcaaa789fd5df4581e8d (patch) | |
| tree | 8cc6602a15ebe43cf3a7968d886a8a9ef7071ec9 /contrib/scripts | |
| parent | 2633eefb19843059b4c3e5b7ad272129abb4d59f (diff) | |
Merged revisions 119302 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r119302 | mvanbaak | 2008-05-30 18:47:24 +0200 (Fri, 30 May 2008) | 22 lines
Merged revisions 119301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r119301 | mvanbaak | 2008-05-30 18:44:39 +0200 (Fri, 30 May 2008) | 14 lines
dont use a bashism way to check the $VERSION variable.
The rc/init.d scripts, and safe_asterisk work on normal sh now again.
Tested on:
OpenBSD 4.2 (me)
Debian etch (me)
Ubuntu Hardy (me and loloski)
FC9 (loloski)
(closes issue #12687)
Reported by: loloski
Patches:
20080529-12687-safe_asterisk-fixversion.diff.txt uploaded by mvanbaak (license 7)
Tested by: loloski, mvanbaak
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@119303 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib/scripts')
| -rw-r--r-- | contrib/scripts/safe_asterisk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk index e73933ad4..c8841f3ed 100644 --- a/contrib/scripts/safe_asterisk +++ b/contrib/scripts/safe_asterisk @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent CLIARGS="$*" # Grab any args passed to safe_asterisk @@ -41,7 +41,7 @@ function 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'` -if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t" +if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then message "Asterisk is already running. $0 will exit now." exit 1 fi |