diff options
| author | mjwybrow <mjwybrow@users.sourceforge.net> | 2007-02-05 01:37:43 +0000 |
|---|---|---|
| committer | mjwybrow <mjwybrow@users.sourceforge.net> | 2007-02-05 01:37:43 +0000 |
| commit | c73c4ce91f85c1bdb4cacb6a264dc8d3fc21ab80 (patch) | |
| tree | 880b442b92c5d4d59394b43c0fd691e525ecacd8 /packaging/macosx/Resources/script | |
| parent | Reverting patch (diff) | |
| download | inkscape-c73c4ce91f85c1bdb4cacb6a264dc8d3fc21ab80.tar.gz inkscape-c73c4ce91f85c1bdb4cacb6a264dc8d3fc21ab80.zip | |
* packaging/macosx/ScriptExec/main.c, packaging/macosx/Resources/script:
Present a new message to OS X users describing the delay when starting
Inkscape for the first time, as well as the fact that Inkscape windows
will be part of the X11 application. Also, bounce the dock icon so
that users will actually see this message.
(bzr r2329)
Diffstat (limited to 'packaging/macosx/Resources/script')
| -rwxr-xr-x | packaging/macosx/Resources/script | 14 |
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" |