diff options
| author |   Adam Feldman <NP-Hardass@gentoo.org> | 2020-04-07 14:05:30 -0400 |
|---|---|---|
| committer | Adam Feldman <NP-Hardass@gentoo.org> | 2020-04-07 14:31:12 -0400 |
| commit | 118c72a585b3dd6db178db38f2938e7048a1a13b (patch) | |
| tree | c199a06921c0e3327d38b68aafad536d27a5cad4 /mate-base | |
| parent | mate-extra/caja-admin: Fix QA warnings (diff) | |
| download | gentoo-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')
| -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 | ||||
| -rw-r--r-- | mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild (renamed from mate-base/mate-session-manager/mate-session-manager-1.22.3-r1.ebuild) | 4 | ||||
| -rw-r--r-- | mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild (renamed from mate-base/mate-session-manager/mate-session-manager-1.24.0-r1.ebuild) | 4 |
4 files changed, 10 insertions, 6 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 994d978dcb3d..fd58c0a5b276 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 8bf113e6882c..40f2fd13b343 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 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 index 9eb1d35adf53..a359dd0028cd 100644 --- 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 index 1788d072af18..3e6f3ca50131 100644 --- 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 } |