diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-08-20 12:47:24 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-08-20 12:47:24 +0000 |
| commit | 6c1a6610cc1db07396ad83d53ee4beb5c3ba7a2d (patch) | |
| tree | b15d4e1c7f15b7bbdaeaf77db31518edad859ce5 | |
| parent | update name and location of loader caches (upstream changes) (diff) | |
| download | inkscape-6c1a6610cc1db07396ad83d53ee4beb5c3ba7a2d.tar.gz inkscape-6c1a6610cc1db07396ad83d53ee4beb5c3ba7a2d.zip | |
prepare to use XDG Base Directory Specification for user files
(bzr r13506.1.22)
| -rwxr-xr-x | packaging/macosx/Resources/bin/inkscape | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 207a4a8a4..9f60231d6 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -42,12 +42,22 @@ export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" # No longer required if path rewriting has been conducted. # export DYLD_LIBRARY_PATH="$TOP/lib" -mkdir -p "${HOME}/.inkscape-etc" +XDG_CACHE_HOME="${HOME}/.cache" +XDG_CONFIG_HOME="${HOME}/.config" +XDG_DATA_HOME="${HOME}/.local/share" + +mkdir -p "$XDG_CACHE_HOME" +mkdir -p "$XDG_CONFIG_HOME" +mkdir -p "$XDG_DATA_HOME" + +#INK_CACHE_DIR="${XDG_CACHE_HOME}/inkscape" +INK_CACHE_DIR="${HOME}/.inkscape-etc" +mkdir -p "$INK_CACHE_DIR" export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="${HOME}/.inkscape-etc/pangorc" -export GTK_IM_MODULE_FILE="${HOME}/.inkscape-etc/immodules.cache" -export GDK_PIXBUF_MODULE_FILE="${HOME}/.inkscape-etc/loaders.cache" +export PANGO_RC_FILE="${INK_CACHE_DIR}/pangorc" +export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" @@ -115,12 +125,12 @@ fi [ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 export LC_ALL="$LANG" -sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc" +sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "${HOME}/.inkscape-etc/pango.modules" + > "${INK_CACHE_DIR}/pango.modules" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ - > "${HOME}/.inkscape-etc/immodules.cache" + > "${INK_CACHE_DIR}/immodules.cache" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ - > "${HOME}/.inkscape-etc/loaders.cache" + > "${INK_CACHE_DIR}/loaders.cache" exec "$CWD/inkscape-bin" "$@" |