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 <[email protected]>
hanetzer · Apr 7, 2020 · 118c72a · 118c72a
1 parent 553c77e
commit 118c72a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/...manager/files/10-user-dirs-update-mate-r1 → ...manager/files/10-user-dirs-update-mate-r2 b/...manager/files/10-user-dirs-update-mate-r1 → ...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/...session-manager/files/15-xdg-data-mate-r1 → ...session-manager/files/15-xdg-data-mate-r2 b/...session-manager/files/15-xdg-data-mate-r1 → ...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

diff --git a/...ger/mate-session-manager-1.22.3-r1.ebuild → ...ger/mate-session-manager-1.22.3-r2.ebuild b/...ger/mate-session-manager-1.22.3-r1.ebuild → ...ger/mate-session-manager-1.22.3-r2.ebuild
@@ -83,8 +83,8 @@ src_install() {
 
 	dodir /etc/X11/xinit/xinitrc.d/
 	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}"/15-xdg-data-mate-r1 15-xdg-data-mate
+	newexe "${FILESDIR}"/15-xdg-data-mate-r2 15-xdg-data-mate
 
 	# This should be done in MATE too, see Gentoo bug #270852
-	newexe "${FILESDIR}"/10-user-dirs-update-mate-r1 10-user-dirs-update-mate
+	newexe "${FILESDIR}"/10-user-dirs-update-mate-r2 10-user-dirs-update-mate
 }
diff --git a/...ger/mate-session-manager-1.24.0-r1.ebuild → ...ger/mate-session-manager-1.24.0-r2.ebuild b/...ger/mate-session-manager-1.24.0-r1.ebuild → ...ger/mate-session-manager-1.24.0-r2.ebuild
@@ -82,8 +82,8 @@ src_install() {
 
 	dodir /etc/X11/xinit/xinitrc.d/
 	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}"/15-xdg-data-mate-r1 15-xdg-data-mate
+	newexe "${FILESDIR}"/15-xdg-data-mate-r2 15-xdg-data-mate
 
 	# This should be done in MATE too, see Gentoo bug #270852
-	newexe "${FILESDIR}"/10-user-dirs-update-mate-r1 10-user-dirs-update-mate
+	newexe "${FILESDIR}"/10-user-dirs-update-mate-r2 10-user-dirs-update-mate
 }