diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-26 13:08:12 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-26 13:08:12 +0000 |
| commit | 716707e7c3b2ef5ba60ec550083d992fb96f8c08 (patch) | |
| tree | 8f30ab9eea8b94fa87a2c8b70e4b27511345016c /contrib | |
| parent | fe4c4462a608a39c5bea9556b1a98e61c28d612e (diff) | |
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)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@196660 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/scripts/safe_asterisk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk index 33a477d07..ea36a3241 100644 --- a/contrib/scripts/safe_asterisk +++ b/contrib/scripts/safe_asterisk @@ -61,7 +61,7 @@ then 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 @@ else 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 @@ trap '' PIPE 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 @@ run_asterisk() 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." | \ |