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: https://origsvn.digium.com/svn/asterisk/trunk@119302 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
index 0d9eb69..015f2db 100755 (executable)
--- a/contrib/init.d/rc.debian.asterisk
+++ b/contrib/init.d/rc.debian.asterisk
@@ -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

diff --git a/contrib/init.d/rc.gentoo.asterisk b/contrib/init.d/rc.gentoo.asterisk
index efc87af..161bdd0 100755 (executable)
--- a/contrib/init.d/rc.gentoo.asterisk
+++ b/contrib/init.d/rc.gentoo.asterisk
@@ -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

diff --git a/contrib/init.d/rc.mandrake.asterisk b/contrib/init.d/rc.mandrake.asterisk
index 8d4f0b7..e9da4a8 100755 (executable)
--- a/contrib/init.d/rc.mandrake.asterisk
+++ b/contrib/init.d/rc.mandrake.asterisk
@@ -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

diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
index de821fe..aeaa8f1 100755 (executable)
--- a/contrib/init.d/rc.redhat.asterisk
+++ b/contrib/init.d/rc.redhat.asterisk
@@ -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

diff --git a/contrib/init.d/rc.slackware.asterisk b/contrib/init.d/rc.slackware.asterisk
index 0b2d3a7..c1db46f 100755 (executable)
--- a/contrib/init.d/rc.slackware.asterisk
+++ b/contrib/init.d/rc.slackware.asterisk
@@ -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

diff --git a/contrib/init.d/rc.suse.asterisk b/contrib/init.d/rc.suse.asterisk
index c8d94df..d7f1b82 100755 (executable)
--- a/contrib/init.d/rc.suse.asterisk
+++ b/contrib/init.d/rc.suse.asterisk
@@ -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

diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk
index e73933a..c8841f3 100644 (file)
--- 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