summaryrefslogtreecommitdiffstats
path: root/packaging/macosx/Resources/script
diff options
context:
space:
mode:
Diffstat (limited to 'packaging/macosx/Resources/script')
-rwxr-xr-xpackaging/macosx/Resources/script14
1 files changed, 9 insertions, 5 deletions
diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script
index a343227c9..5608f7423 100755
--- a/packaging/macosx/Resources/script
+++ b/packaging/macosx/Resources/script
@@ -5,6 +5,7 @@
CWD="`dirname \"$0\"`"
+
ps -wx -ocommand | grep -e '[X]11' > /dev/null
if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
echo "rm -f ~/.xinitrc" > ~/.xinitrc
@@ -24,11 +25,14 @@ export DISPLAY="`cat /tmp/display.$UID`"
ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11
-VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'`
-if [ "$VERSION" -eq "4" ]; then
- # We're on tiger. So need to update fc-cache if it hasn't been done
- test -f ~/.inkscape/.fccache || exit 12
-fi
+# Old OS X version specific test:
+#
+#VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'`
+#if [ "$VERSION" -eq "4" ]; then
+
+# 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"