diff options
| author | Eitan Isaacson <eitan@monotonous.org> | 2011-06-13 12:01:40 -0700 |
|---|---|---|
| committer | Eitan Isaacson <eitan@monotonous.org> | 2011-06-13 14:09:40 -0700 |
| commit | 8a1b6275cd8c82df8b42aba187f35f91b2840db0 (patch) | |
| tree | bff853cf66301ec45a78657fef69184c47ab70c9 /bin | |
| parent | 2bfbeb3979e4a5f54705b7328d517264c88e2936 (diff) | |
| download | caribou-8a1b6275cd8c82df8b42aba187f35f91b2840db0.tar.gz | |
Fix executables to set implicit XDG_DATA_DIRS
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/antler-keyboard.in | 3 | ||||
| -rwxr-xr-x | bin/caribou-preferences.in | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bin/antler-keyboard.in b/bin/antler-keyboard.in index 35dc200..1b0c450 100755 --- a/bin/antler-keyboard.in +++ b/bin/antler-keyboard.in @@ -25,10 +25,11 @@ exec_prefix=@exec_prefix@ if [ $script_dir == "@libexecdir@" ] then + datadir="$(@PYTHON@ -c "import glib; print ':'.join(glib.get_system_data_dirs())")" export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" - export XDG_DATA_DIRS="@datadir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}" + export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" else export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" diff --git a/bin/caribou-preferences.in b/bin/caribou-preferences.in index 6621054..6aae29e 100755 --- a/bin/caribou-preferences.in +++ b/bin/caribou-preferences.in @@ -25,10 +25,11 @@ exec_prefix=@exec_prefix@ if [ $script_dir == "@bindir@" ] then + datadir="$(@PYTHON@ -c "import glib; print ':'.join(glib.get_system_data_dirs())")" export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}" - export XDG_DATA_DIRS="@datadir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}" + export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" else export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" |