merge with master, primarily for adrian's maximise-mixer change

[ardour.git] / tools / osx_packaging / startup_script

diff --git a/tools/osx_packaging/startup_script b/tools/osx_packaging/startup_script
index c7b9b5acf82cb4cf555ad51642a8c62a5e5d150d..8e6ce2f48cf3794e813474c5a5a8c75244949811 100644 (file)
--- a/tools/osx_packaging/startup_script
+++ b/tools/osx_packaging/startup_script
@@ -16,9 +16,23 @@ end tell'
 fi
 
 #
+# Some versions of Audacity leave /usr/local/lib unreadable/unsearchable. Ardour will not be able to start up if this is 
+# the case, because we need access to /usr/local/lib/libjack.dylib
+#
+
+if test ! -x /usr/local/lib -o ! -r /usr/local/lib ; then
+   /usr/bin/osascript -e 'tell application "Finder"
+display dialog "You appear to have previously installed Audacity which altered your filesystem incorrectly. Ardour cannot run until this is corrected. To correct the error, type the following command into a Terminal window: chmod 755 /usr/local/lib" buttons["OK"]
+end tell'
+   exit 1
+fi
+
+# this needs to be set so that we can restore the environment when we want to find JACK (or similar)
+export PREBUNDLE_ENV="$(env)"
+
 # all clear, lets go
 # this quoting is all needed to handle installation
 # in folders likes /home/user/Frank's Wild Years
 
 CWD="`/usr/bin/dirname \"$0\"`"
-exec "$CWD/Ardour2.bin" "$*"
+exec "$CWD/Ardour3.bin" "$@"