[arch-commits] Commit in flatpak/trunk (PKGBUILD flatpak-bindir.sh)

[Jan Steffens]

    Date: Thursday, June 3, 2021 @ 12:15:28
  Author: heftig
Revision: 417045

1.11.1-2: Use append_path in bindir script and check XDG_DATA_HOME

Modified:
  flatpak/trunk/PKGBUILD
  flatpak/trunk/flatpak-bindir.sh

-------------------+
 PKGBUILD          |    4 ++--
 flatpak-bindir.sh |    8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-03 12:11:43 UTC (rev 417044)
+++ PKGBUILD	2021-06-03 12:15:28 UTC (rev 417045)
@@ -4,7 +4,7 @@
 
 pkgname=flatpak
 pkgver=1.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)"
 url="https://flatpak.org"
 arch=(x86_64)
@@ -27,7 +27,7 @@
             'SKIP'
             'SKIP'
             '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a'
-            'cf20e4831bceaaee74e9298b4ad7c4d2d51085d43f62d1c6a2d2977d2f421e00')
+            '1824cb4eb1cc88702cb2b9f1c55b6dfdf20fca5eab83f6e8e532099281328745')
 
 prepare() {
   cd $pkgname

Modified: flatpak-bindir.sh
===================================================================
--- flatpak-bindir.sh	2021-06-03 12:11:43 UTC (rev 417044)
+++ flatpak-bindir.sh	2021-06-03 12:15:28 UTC (rev 417045)
@@ -1,7 +1,9 @@
-if [ -d "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then
-  PATH="$PATH:$HOME/.local/share/flatpak/exports/bin"
+if [ -n "$XDG_DATA_HOME" ] && [ -d "$XDG_DATA_HOME/flatpak/exports/bin" ]; then
+  append_path "$XDG_DATA_HOME/flatpak/exports/bin"
+elif [ -n "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then
+  append_path "$HOME/.local/share/flatpak/exports/bin"
 fi
 
 if [ -d /var/lib/flatpak/exports/bin ]; then
-  PATH="$PATH:/var/lib/flatpak/exports/bin"
+  append_path /var/lib/flatpak/exports/bin
 fi