summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Feldman <NP-Hardass@gentoo.org>2020-04-07 14:05:30 -0400
committerAdam Feldman <NP-Hardass@gentoo.org>2020-04-07 14:31:12 -0400
commit118c72a585b3dd6db178db38f2938e7048a1a13b (patch)
treec199a06921c0e3327d38b68aafad536d27a5cad4 /mate-base/mate-session-manager/files
parentmate-extra/caja-admin: Fix QA warnings (diff)
downloadgentoo-118c72a585b3dd6db178db38f2938e7048a1a13b.tar.gz
gentoo-118c72a585b3dd6db178db38f2938e7048a1a13b.tar.bz2
gentoo-118c72a585b3dd6db178db38f2938e7048a1a13b.zip
mate-base/mate-session-manager: Fix typo and to hopefully be foolproof
Thanks to Joakim Tjerlund for pointing it out. Bug: https://bugs.gentoo.org/633334 Package-Manager: Portage-2.3.96, Repoman-2.3.21 Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>
Diffstat (limited to 'mate-base/mate-session-manager/files')
-rw-r--r--mate-base/mate-session-manager/files/10-user-dirs-update-mate-r2 (renamed from mate-base/mate-session-manager/files/10-user-dirs-update-mate-r1)4
-rw-r--r--mate-base/mate-session-manager/files/15-xdg-data-mate-r2 (renamed from mate-base/mate-session-manager/files/15-xdg-data-mate-r1)4
2 files changed, 6 insertions, 2 deletions
diff --git a/mate-base/mate-session-manager/files/10-user-dirs-update-mate-r1 b/mate-base/mate-session-manager/files/10-user-dirs-update-mate-r2
index 994d978dcb3..fd58c0a5b27 100644
--- a/mate-base/mate-session-manager/files/10-user-dirs-update-mate-r1
+++ b/mate-base/mate-session-manager/files/10-user-dirs-update-mate-r2
@@ -3,7 +3,9 @@
# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
# That file is read by glib to get XDG_PICTURES_DIR, etc
-if [ "$XDG_CURRENT_DESKTOP" = "MATE" ]; then
+if [ "$XDG_CURRENT_DESKTOP" = "MATE" -o \
+ "$XDG_SESSION_DESKTOP" = "mate" -o \
+ "$DESKTOP_SESSION" = "mate" ]; then
if type xdg-user-dirs-update >/dev/null 2>&1; then
xdg-user-dirs-update
fi
diff --git a/mate-base/mate-session-manager/files/15-xdg-data-mate-r1 b/mate-base/mate-session-manager/files/15-xdg-data-mate-r2
index 8bf113e6882..40f2fd13b34 100644
--- a/mate-base/mate-session-manager/files/15-xdg-data-mate-r1
+++ b/mate-base/mate-session-manager/files/15-xdg-data-mate-r2
@@ -1,6 +1,8 @@
#!/bin/sh
-if [ "$XDG_DESKTOP_SESSION" = "MATE" ]; then
+if [ "$XDG_CURRENT_DESKTOP" = "MATE" -o \
+ "$XDG_SESSION_DESKTOP" = "mate" -o \
+ "$DESKTOP_SESSION" = "mate" ]; then
if [ -z "$XDG_DATA_DIRS" ]; then
export XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/
else