diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-08-21 10:26:09 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-08-21 10:26:09 +0000 |
| commit | b0641984cc0670a084bc5945e28100b154f57178 (patch) | |
| tree | 79959735bb78c71bc9afc1f2f25b07272bf0e4c5 /packaging/macosx/Resources/script | |
| parent | build scripts: refactor tests based on OS X version (diff) | |
| download | inkscape-b0641984cc0670a084bc5945e28100b154f57178.tar.gz inkscape-b0641984cc0670a084bc5945e28100b154f57178.zip | |
launcher scripts: move fc-cache alert to script, define xdg setup in single location and source it from script and openDoc
(bzr r13506.1.36)
Diffstat (limited to 'packaging/macosx/Resources/script')
| -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 a418cca45..de839484d 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -2,21 +2,21 @@ # # Author: Aaron Voisine <aaron@voisine.org> # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> +# Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net> -CWD="$(cd "$(dirname "$0")" && pwd)" - -# Warn the user about time-consuming generation of fontconfig caches. -# TODO: Somehow keep in sync with ScriptExec and bin/inkscape. -# Ideally refer to $XDG_CACHE_HOME/inkscape everywhere, but how? -test -f "${HOME}/.cache/inkscape/.fccache-new" || exit 12 +#export _DEBUG=true +CWD="$(cd "$(dirname "$0")" && pwd)" +source "${CWD}/xdg_setup.sh" +source "${CWD}/alert_fccache.sh" BASE="$(echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//')" cd "$BASE" -exec "$CWD/bin/inkscape" "$@" + # TODO examine whether 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. +exec "$CWD/bin/inkscape" "$@" |