[svn-commits] file: branch 1.6.1 r196660 - in /branches/1.6.1: ./ contrib/scripts/

[SVN commits to the Digium repositories]

Author: file
Date: Tue May 26 08:08:12 2009
New Revision: 196660

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

................
  r196658 | file | 2009-05-26 10:06:50 -0300 (Tue, 26 May 2009) | 14 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/contrib/scripts/safe_asterisk

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

Modified: branches/1.6.1/contrib/scripts/safe_asterisk
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/contrib/scripts/safe_asterisk?view=diff&rev=196660&r1=196659&r2=196660
==============================================================================
--- branches/1.6.1/contrib/scripts/safe_asterisk (original)
+++ branches/1.6.1/contrib/scripts/safe_asterisk Tue May 26 08:08:12 2009
@@ -61,7 +61,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.
@@ -74,7 +74,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
@@ -137,7 +137,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
@@ -161,7 +161,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." | \