[svn-commits] lmadsen: branch 1.6.0 r254539 - in /branches/1.6.0: ./ contrib/scripts/

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Thu Mar 25 12:02:17 2010
New Revision: 254539

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=254539
Log:
Make safe_asterisk work on dash/sh/bash etc.

Merged from the change to trunk via issue #13111. For some reason
the changes there were only done on trunk, and thus were available
for 1.6.1 and 1.6.2 when they were branched. Because this change is
available on both 1.6.1 and 1.6.2, it makes sense to allow it on the
1.6.0 branch as well.

(closes issue #17094)
Reported by: stuarth

Much thanks to Tilghman and Sean Bright for the help on this merge.

Merged revisions 135061 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r135061 | mvanbaak | 2008-08-01 07:17:33 -0500 (Fri, 01 Aug 2008) | 8 lines
  
  Make safe_asterisk work on dash/sh/bash etc.
  
  (closes issue #13111)
  Reported by: pabelanger
  Patches:
        2008071901_issue13111_safe_asterisk.diff uploaded by mvanbaak (license 7)
  Tested by: mvanbaak, pabelanger
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/contrib/scripts/safe_asterisk

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-blocked' - no diff available.

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/contrib/scripts/safe_asterisk
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/contrib/scripts/safe_asterisk?view=diff&rev=254539&r1=254538&r2=254539
==============================================================================
--- branches/1.6.0/contrib/scripts/safe_asterisk (original)
+++ branches/1.6.0/contrib/scripts/safe_asterisk Thu Mar 25 12:02:17 2010
@@ -32,7 +32,7 @@
 # set to the system's maximum files open devided by two, if not set here.
 # MAXFILES=32768
 
-function message() {
+message() {
 	echo "$1" >&2
 	if test "x$SYSLOG" != "x" ; then
 	    logger -p "${SYSLOG}.warn" -t safe_asterisk[$$] "$1"
@@ -142,7 +142,7 @@
 		if test "x$TTY" != "x" ; then
 			cd /tmp
 			stty sane < /dev/${TTY}
-			nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS} >& /dev/${TTY} < /dev/${TTY}
+			nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS} > /dev/${TTY} 2>&1 < /dev/${TTY}
 		else
 			cd /tmp
 			nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS}