modified fix for leopard according to comment on bug 1821094

diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script
index 986cb530bd188d1884cd576f189ad23b3f4f123d..90e23718343b6e7c57bf959bded047ac5dcb0914 100755 (executable)
--- a/packaging/macosx/Resources/script
+++ b/packaging/macosx/Resources/script
@@ -9,15 +9,15 @@ CWD="`dirname \"$0\"`"
 VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'`
 
 
-# FIXME apparently this removes the xterm that starts with X from xinitrc but when is it really used? Should we modify the .xinitrc of the user without warning?
-ps -wx -ocommand | grep -e '[X]11' > /dev/null
-if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
-    echo "rm -f ~/.xinitrc" > ~/.xinitrc
-    sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> ~/.xinitrc
-fi
-
 # For Panther and Tiger, start X11
 if [[ $VERSION -le 4 ]]; then
+       # FIXME apparently this removes the xterm that starts with X from xinitrc but when is it really used? Should we modify the .xinitrc of the user without warning?
+       ps -wx -ocommand | grep -e '[X]11' > /dev/null
+       if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
+           echo "rm -f ~/.xinitrc" > ~/.xinitrc
+           sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> ~/.xinitrc
+       fi
+
        # Start X11 and get DISPLAY
        cp -f "$CWD/bin/getdisplay.sh" /tmp/
        rm -f /tmp/display.$UID