diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-17 21:12:20 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-17 21:12:20 +0000 |
commit | e066fe6c9daa265a980cde17909196b90bf90aa9 (patch) | |
tree | fb5654ceab95612c27dc698b0bc928826b6a3194 /tools | |
parent | 144a9ab9dd934efd635851b098b26b5b21f00baf (diff) |
make startup script for OS X X11 DMG work on leopard
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2933 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/osx_packaging/script | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/tools/osx_packaging/script b/tools/osx_packaging/script index faf92eded8..b003337418 100755 --- a/tools/osx_packaging/script +++ b/tools/osx_packaging/script @@ -32,17 +32,22 @@ if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> ~/.xinitrc fi -mkdir -p $TMP -cp -f "$CWD/bin/getdisplay.sh" $TMP -rm -f $TMP/display -open-x11 $TMP/getdisplay.sh || \ -open -a XDarwin $TMP/getdisplay.sh || \ -echo ":0" > $TMP/display - -while [ "$?" == "0" -a ! -f $TMP/display ]; do sleep 1; done -export "DISPLAY=`cat $TMP/display`" - -ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11 +if uname -r | grep -sq '^9' ; then + # leopard will auto-start X11 for us + : +else + mkdir -p $TMP + cp -f "$CWD/bin/getdisplay.sh" $TMP + rm -f $TMP/display + open-x11 $TMP/getdisplay.sh || \ + open -a XDarwin $TMP/getdisplay.sh || \ + echo ":0" > $TMP/display + + while [ "$?" == "0" -a ! -f $TMP/display ]; do sleep 1; done + export "DISPLAY=`cat $TMP/display`" + + ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11 +fi cd ~/ shift |