[asterisk-commits] tilghman: testsuite/bamboo/trunk r800 - /bamboo/trunk/bin/build-asterisk.sh

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Oct  6 14:24:44 2010
New Revision: 800

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=800
Log:
Simple changes for Mac OS X

Modified:
    bamboo/trunk/bin/build-asterisk.sh

Modified: bamboo/trunk/bin/build-asterisk.sh
URL: http://svnview.digium.com/svn/testsuite/bamboo/trunk/bin/build-asterisk.sh?view=diff&rev=800&r1=799&r2=800
==============================================================================
--- bamboo/trunk/bin/build-asterisk.sh (original)
+++ bamboo/trunk/bin/build-asterisk.sh Wed Oct  6 14:24:44 2010
@@ -39,19 +39,23 @@
 
 stop_asterisk() {
 	echo "*** Stopping Asterisk ***"
-	asterisk -rx "core stop now"
-	sleep 5
 
 	if [ -d /Library/LaunchDaemons ] ; then
 		# Mac OSX
-		launchctl unload -w /Library/LaunchDaemons/org.asterisk.asterisk.plist
-	fi
+		launchctl unload -w /Library/LaunchDaemons/org.asterisk.asterisk.plist || :
+	else
+		asterisk -rx "core stop now"
+	fi
+	sleep 5
 
 	(killall -9 asterisk || :) > /dev/null 2>&1
 }
 
 killall_asterisk() {
 	echo "*** Killing all running Asterisk processes ***"
+	if [ -d /Library/LaunchDaemons ] ; then
+		launchctl unload -w /Library/LaunchDaemons/org.asterisk.asterisk.plist || :
+	fi
 	(killall -9 asterisk || :) > /dev/null 2>&1
 }
 
@@ -150,7 +154,9 @@
 fi
 if [ -d addons ] ; then
 	menuselect/menuselect --enable-category MENUSELECT_ADDONS menuselect.makeopts
-	contrib/scripts/get_mp3_source.sh
+	if test -f addons/mp3/mpg123.h ; then :; else
+		contrib/scripts/get_mp3_source.sh
+	fi
 fi
 if [ -d bridges ] ; then
 	menuselect/menuselect --enable-category MENUSELECT_BRIDGES menuselect.makeopts