[asterisk-commits] file: trunk r196658 - in /trunk: ./ contrib/scripts/safe_asterisk

[SVN commits to the Asterisk project]

Author: file
Date: Tue May 26 08:06:50 2009
New Revision: 196658

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196658
Log:
Merged revisions 196657 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r196657 | file | 2009-05-26 10:06:09 -0300 (Tue, 26 May 2009) | 7 lines
  
  Remove some bash specific stuff from safe_asterisk.
  
  (closes issue #10812)
  Reported by: paravoid
  Patches:
        safe_asterisk_bashism.diff uploaded by tzafrir (license 46)
........

Modified:
    trunk/   (props changed)
    trunk/contrib/scripts/safe_asterisk

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/contrib/scripts/safe_asterisk
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/contrib/scripts/safe_asterisk?view=diff&rev=196658&r1=196657&r2=196658
==============================================================================
--- trunk/contrib/scripts/safe_asterisk (original)
+++ trunk/contrib/scripts/safe_asterisk Tue May 26 08:06:50 2009
@@ -62,7 +62,7 @@
 	PRIORITY=0
 	message "safe_asterisk was started by `id -n` (uid `id -u`)."
 else
-	if `echo $OSTYPE | grep linux 2>&1 > /dev/null `
+	if `uname -s | grep Linux 2>&1 > /dev/null `
 	then
 		# maximum number of open files is set to the system maximum divided by two if
 		# MAXFILES is not set.
@@ -75,7 +75,7 @@
 			fi
 		fi
 		SYSCTL_MAXFILES="fs.file-max"
-	elif `echo $OSTYPE | grep darwin 2>&1 > /dev/null `
+	elif `uname -s | grep Darwin 2>&1 > /dev/null `
 	then
 		SYSCTL_MAXFILES="kern.maxfiles"
 	fi
@@ -143,7 +143,7 @@
 if [ -d /etc/asterisk/startup.d ]; then
 	for script in /etc/asterisk/startup.d/*.sh; do
 		if [ -x ${script} ]; then
-			source ${script}
+			. ${script}
 		fi
 	done
 fi
@@ -167,7 +167,7 @@
 			message "Asterisk shutdown normally."
 			exit 0
 		elif [ $EXITSTATUS -gt 128 ]; then
-			let EXITSIGNAL=EXITSTATUS-128
+			EXITSIGNAL=EXITSTATUS-128
 			echo "Asterisk exited on signal $EXITSIGNAL."
 			if [ "$NOTIFY" != "" ]; then
 				echo "Asterisk on $MACHINE exited on signal $EXITSIGNAL.  Might want to take a peek." | \