dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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/trunk@119302 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
mvanbaak 2008-05-30 16:47:24 +00:00
parent 911e8790c9
commit 1a981f03f5
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/init.d/rc.debian.asterisk
View File

@ -55,7 +55,7 @@ case "$1" in
# 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} -rx 'core show version' || ${TRUE}`
if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
echo "Asterisk is already running. $0 will exit now."
exit 1
fi

2
contrib/init.d/rc.gentoo.asterisk
View File

@ -9,7 +9,7 @@ start() {
# 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
echo "Asterisk is already running. $0 will exit now."
exit 1
fi

2
contrib/init.d/rc.mandrake.asterisk
View File

@ -122,7 +122,7 @@ case "$1" in
# Check if Asterisk is already running. If it is, then bug out, because
# starting Asterisk when Asterisk is already 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
echo "Asterisk is already running. $0 will exit now."
exit 1
fi

2
contrib/init.d/rc.redhat.asterisk
View File

@ -71,7 +71,7 @@ start() {
# Check if Asterisk is already running. If it is, then bug out, because
# starting safe_asterisk when Asterisk is running is very bad.
VERSION=`${AST_SBIN}/asterisk -rx 'core show version'`
if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
echo "Asterisk is already running."
exit 1
fi

2
contrib/init.d/rc.slackware.asterisk
View File

@ -13,7 +13,7 @@ asterisk_start() {
# Check if Asterisk is already running. If it is, then bug out, because
# starting safe_asterisk when Asterisk is running is very bad.
VERSION=`/usr/sbin/asterisk -rx 'core show version'`
if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
echo "Asterisk is already running. $0 will exit now."
exit 1
fi

2
contrib/init.d/rc.suse.asterisk
View File

@ -67,7 +67,7 @@ start() {
# Check if Asterisk is already running. If it is, then bug out, because
# starting Asterisk when Asterisk is already running is very bad.
VERSION=`/usr/sbin/asterisk -rx 'core show version'`
if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
echo "Asterisk is already running. $0 will exit now."
exit 1
fi

4
contrib/scripts/safe_asterisk
View File

@ -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