diff options
| author | Nicolas Lécureuil <neoclust@mageia.org> | 2016-07-28 23:42:38 +0200 |
|---|---|---|
| committer | Nicolas Lécureuil <neoclust@mageia.org> | 2016-07-28 23:42:38 +0200 |
| commit | 3186e14b8f663527bc48314fc01f95a4b97a27aa (patch) | |
| tree | 629874834a2fee5d5507687b3ef3ba35ccfca43e /etc | |
| parent | b2db488b5b8d03886609c9e1a0b817a40b54c6c3 (diff) | |
| download | config-3186e14b8f663527bc48314fc01f95a4b97a27aa.tar config-3186e14b8f663527bc48314fc01f95a4b97a27aa.tar.gz config-3186e14b8f663527bc48314fc01f95a4b97a27aa.tar.bz2 config-3186e14b8f663527bc48314fc01f95a4b97a27aa.tar.xz config-3186e14b8f663527bc48314fc01f95a4b97a27aa.zip | |
Fix XDG_MENU_PREFIX
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/xdg/plasma-workspace/env/env.sh | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/etc/xdg/plasma-workspace/env/env.sh b/etc/xdg/plasma-workspace/env/env.sh index 992b9f3..27afac0 100644 --- a/etc/xdg/plasma-workspace/env/env.sh +++ b/etc/xdg/plasma-workspace/env/env.sh @@ -1,9 +1,24 @@ ## from http://standards.freedesktop.org/menu-spec/latest/ # XDG_CONFIG_DIRS -if [ -z "${XDG_CONFIG_DIRS}" ] ; then - XDG_CONFIG_DIRS=/etc/xdg:/var/lib/plasma5-profiles/common/xdg - export XDG_CONFIG_DIRS +#if [ -z "${XDG_CONFIG_DIRS}" ] ; then +# XDG_CONFIG_DIRS=/etc/xdg:/var/lib/plasma5-profiles/common/xdg +# export XDG_CONFIG_DIRS +#fi + +if [ "$MGA_MENU_STYLE" = "upstream" ]; then + if [ -z "$XDG_CONFIG_DIRS" ]; then + export XDG_CONFIG_DIRS="/etc/xdg/kf5:/etc/xdg" + else + export XDG_CONFIG_DIRS="/etc/xdg/kf5:$XDG_CONFIG_DIRS" + fi +else + if [ -z "$XDG_CONFIG_DIRS" ]; then + export XDG_CONFIG_DIRS="/etc/xdg:/etc/xdg/kf5:/var/lib/plasma5-profiles/common/xdg" + else + export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:/etc/xdg/kf5:/var/lib/plasma5-profiles/common/xdg" + fi + export XDG_MENU_PREFIX="kf5-" fi @@ -13,9 +28,3 @@ if [ -z "${XDG_DATA_DIRS}" ] ; then export XDG_DATA_DIRS fi -# XDG_MENU_PREFIX -if [ -z "${XDG_MENU_PREFIX}" ] ; then - XDG_MENU_PREFIX="kf5-" - export XDG_MENU_PREFIX -fi - |