summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/xdg/plasma-workspace/env/env.sh27
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
-