diff options
| author | mjwybrow <mjwybrow@users.sourceforge.net> | 2008-03-11 06:02:23 +0000 |
|---|---|---|
| committer | mjwybrow <mjwybrow@users.sourceforge.net> | 2008-03-11 06:02:23 +0000 |
| commit | 5a9a61b260568c8672f72497c12f6b1cfcc03d51 (patch) | |
| tree | b2d27e890b6a896b3d8977b56ec99b4f0a374b68 /packaging/macosx/Resources/script | |
| parent | Fixing to work with current wiki format (diff) | |
| download | inkscape-5a9a61b260568c8672f72497c12f6b1cfcc03d51.tar.gz inkscape-5a9a61b260568c8672f72497c12f6b1cfcc03d51.zip | |
* packaging/macosx/ScriptExec/main.c: Update ScriptExec with upstream fixes
and changes. X11.app now gets focus if the Inkscape icon is clicked while
Inkscape is already open (previously nothing happened).
* packaging/macosx/Resources/openDoc: If Inkscape.app is already open and
a file is dropped on the Inkscape dock icon, or an Inkscape file is
double-clicked in the Finder, that document will now be correctly opened
in a new Inkscape window (previously nothing happened).
* packaging/macosx/Resources/script: Some minor fixes, plus alert the user
about the font cache building time only if ~/.fontconfig/ doesn't exist.
* packaging/macosx/Resources/bin/inkscape: Only override the fontconfig
configuration on OSX 10.4 or earlier, since the fc-cache behaviour has
been corrected on 10.5.
* Info.plist.in: Update the copyright dates, and change Inkscape to be an
Editor for SVG files, rather than a Viewer as it was previously.
(bzr r5050)
Diffstat (limited to 'packaging/macosx/Resources/script')
| -rwxr-xr-x | packaging/macosx/Resources/script | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index 48bfc76cb..95ee6afbf 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -6,7 +6,7 @@ CWD="`dirname \"$0\"`" # System version: 3 for Panther, 4 for Tiger, 5 for Leopard -VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` +export 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 @@ -18,9 +18,9 @@ if [[ $VERSION -le 4 ]]; then # 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 + if [ "$?" != "0" -a ! -f ${HOME}/.xinitrc ]; then + echo "rm -f ${HOME}/.xinitrc" > ${HOME}/.xinitrc + sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> ${HOME}/.xinitrc fi # Start X11 and get DISPLAY @@ -40,7 +40,7 @@ fi # Warn the user about time-consuming generation of fontconfig caches. -test -f ~/.inkscape/.fccache-new || exit 12 +test -d ${HOME}/.fontconfig || exit 12 BASE="`echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//'`" |