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>

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
similarity index 65%
rename from mate-base/mate-session-manager/files/10-user-dirs-update-mate-r1
rename to mate-base/mate-session-manager/files/10-user-dirs-update-mate-r2
index 994d978dcb3d0e5315106b146bf9c733b5ee1824..fd58c0a5b27620f7869d4edd45105ce711f068e7 100644 (file)
--- 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
similarity index 61%
rename from mate-base/mate-session-manager/files/15-xdg-data-mate-r1
rename to mate-base/mate-session-manager/files/15-xdg-data-mate-r2
index 8bf113e6882c7c22a514abe5156905bb71705a12..40f2fd13b3436050d8a799cded453ec8c52f34ab 100644 (file)
--- 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

diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
similarity index 94%
rename from mate-base/mate-session-manager/mate-session-manager-1.22.3-r1.ebuild
rename to mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
index 9eb1d35adf534d414adb19cb1c73d48f5dbd24bf..a359dd0028cd25724d057a30e4fbc04507b253fe 100644 (file)
--- a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r1.ebuild
+++ b/mate-base/mate-session-manager/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/mate-base/mate-session-manager/mate-session-manager-1.24.0-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild
similarity index 94%
rename from mate-base/mate-session-manager/mate-session-manager-1.24.0-r1.ebuild
rename to mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild
index 1788d072af18bc68d2fd238f2acd582ade9feaaf..3e6f3ca50131bfe24fe96e2a8ff39c751b790760 100644 (file)
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.0-r1.ebuild
+++ b/mate-base/mate-session-manager/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
 }