summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 69ea3af)
raw | patch | inline | side by side (parent: 69ea3af)
author | mjwybrow <mjwybrow@users.sourceforge.net> | |
Tue, 19 Feb 2008 23:10:21 +0000 (23:10 +0000) | ||
committer | mjwybrow <mjwybrow@users.sourceforge.net> | |
Tue, 19 Feb 2008 23:10:21 +0000 (23:10 +0000) |
packaging/macosx/Resources/script | patch | blob | history |
index 90e23718343b6e7c57bf959bded047ac5dcb0914..48bfc76cbaf02bd3252e957237aaf71e70bdde03 100755 (executable)
# System version: 3 for Panther, 4 for Tiger, 5 for Leopard
VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'`
+# On Leopard, X11.app is installed by default, and will be started
+# automatically via launchd. On older systems, we need to start
+# X11 ourself.
# 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?
+ # 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
ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11
fi
-# In Leopard, X11 should start on itself
-
# Warn the user about time-consuming generation of fontconfig caches.
test -f ~/.inkscape/.fccache-new || exit 12
BASE="`echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//'`"
cd "$BASE"
exec "$CWD/bin/inkscape" "$@"
-# TODO examine wether it would be wisest to move the code from inkscape shell script and getdisplay.sh to here and only keep the real binary in bin. This may make things easier on Leopard and may also help using Inkscape on the command line
\ No newline at end of file
+# TODO examine wether it would be wisest to move the code from inkscape shell
+# script and getdisplay.sh to here and only keep the real binary in bin. This
+# may make things easier on Leopard and may also help using Inkscape on the
+# command line
+