[asterisk-commits] mvanbaak: trunk r119302 - in /trunk: ./ contrib/init.d/ contrib/scripts/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri May 30 11:47:24 CDT 2008
Author: mvanbaak
Date: Fri May 30 11:47:24 2008
New Revision: 119302
URL: http://svn.digium.com/view/asterisk?view=rev&rev=119302
Log:
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
........
Modified:
trunk/ (props changed)
trunk/contrib/init.d/rc.debian.asterisk
trunk/contrib/init.d/rc.gentoo.asterisk
trunk/contrib/init.d/rc.mandrake.asterisk
trunk/contrib/init.d/rc.redhat.asterisk
trunk/contrib/init.d/rc.slackware.asterisk
trunk/contrib/init.d/rc.suse.asterisk
trunk/contrib/scripts/safe_asterisk
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/contrib/init.d/rc.debian.asterisk
URL: http://svn.digium.com/view/asterisk/trunk/contrib/init.d/rc.debian.asterisk?view=diff&rev=119302&r1=119301&r2=119302
==============================================================================
--- trunk/contrib/init.d/rc.debian.asterisk (original)
+++ trunk/contrib/init.d/rc.debian.asterisk Fri May 30 11:47:24 2008
@@ -55,7 +55,7 @@
# 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
Modified: trunk/contrib/init.d/rc.gentoo.asterisk
URL: http://svn.digium.com/view/asterisk/trunk/contrib/init.d/rc.gentoo.asterisk?view=diff&rev=119302&r1=119301&r2=119302
==============================================================================
--- trunk/contrib/init.d/rc.gentoo.asterisk (original)
+++ trunk/contrib/init.d/rc.gentoo.asterisk Fri May 30 11:47:24 2008
@@ -9,7 +9,7 @@
# 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
Modified: trunk/contrib/init.d/rc.mandrake.asterisk
URL: http://svn.digium.com/view/asterisk/trunk/contrib/init.d/rc.mandrake.asterisk?view=diff&rev=119302&r1=119301&r2=119302
==============================================================================
--- trunk/contrib/init.d/rc.mandrake.asterisk (original)
+++ trunk/contrib/init.d/rc.mandrake.asterisk Fri May 30 11:47:24 2008
@@ -122,7 +122,7 @@
# 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
Modified: trunk/contrib/init.d/rc.redhat.asterisk
URL: http://svn.digium.com/view/asterisk/trunk/contrib/init.d/rc.redhat.asterisk?view=diff&rev=119302&r1=119301&r2=119302
==============================================================================
--- trunk/contrib/init.d/rc.redhat.asterisk (original)
+++ trunk/contrib/init.d/rc.redhat.asterisk Fri May 30 11:47:24 2008
@@ -71,7 +71,7 @@
# 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
Modified: trunk/contrib/init.d/rc.slackware.asterisk
URL: http://svn.digium.com/view/asterisk/trunk/contrib/init.d/rc.slackware.asterisk?view=diff&rev=119302&r1=119301&r2=119302
==============================================================================
--- trunk/contrib/init.d/rc.slackware.asterisk (original)
+++ trunk/contrib/init.d/rc.slackware.asterisk Fri May 30 11:47:24 2008
@@ -13,7 +13,7 @@
# 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
Modified: trunk/contrib/init.d/rc.suse.asterisk
URL: http://svn.digium.com/view/asterisk/trunk/contrib/init.d/rc.suse.asterisk?view=diff&rev=119302&r1=119301&r2=119302
==============================================================================
--- trunk/contrib/init.d/rc.suse.asterisk (original)
+++ trunk/contrib/init.d/rc.suse.asterisk Fri May 30 11:47:24 2008
@@ -67,7 +67,7 @@
# 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
Modified: trunk/contrib/scripts/safe_asterisk
URL: http://svn.digium.com/view/asterisk/trunk/contrib/scripts/safe_asterisk?view=diff&rev=119302&r1=119301&r2=119302
==============================================================================
--- trunk/contrib/scripts/safe_asterisk (original)
+++ trunk/contrib/scripts/safe_asterisk Fri May 30 11:47:24 2008
@@ -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 @@
# 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
More information about the asterisk-commits
mailing list