diff options
| author | JiHO <jiho-sf@users.sourceforge.net> | 2007-11-11 11:42:39 +0000 |
|---|---|---|
| committer | jiho-sf <jiho-sf@users.sourceforge.net> | 2007-11-11 11:42:39 +0000 |
| commit | deb924514baa447bd98bc88916412bb16f96f6ad (patch) | |
| tree | e5328b63d7077d3e4f00f8a10ceed4576cc5bdb7 /packaging | |
| parent | * Dropped geom.c and libwpg from translatable file list (diff) | |
| download | inkscape-deb924514baa447bd98bc88916412bb16f96f6ad.tar.gz inkscape-deb924514baa447bd98bc88916412bb16f96f6ad.zip | |
modified fix for leopard according to comment on bug 1821094
(bzr r4059)
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/Resources/script | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index 986cb530b..90e237183 100755 --- 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 |