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

[Jan Steffens]

    Date: Wednesday, January 31, 2018 @ 18:39:39
  Author: heftig
Revision: 315693

minor changes

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

-------------------+
 PKGBUILD          |   16 ++++------------
 flatpak-bindir.sh |    7 +++++++
 2 files changed, 11 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-31 18:32:55 UTC (rev 315692)
+++ PKGBUILD	2018-01-31 18:39:39 UTC (rev 315693)
@@ -17,10 +17,11 @@
 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"
         "git+https://github.com/projectatomic/bubblewrap"
         "git+https://git.gnome.org/browse/libglnx"
-        'flathub.flatpakrepo')
+        flatpak-bindir.sh flathub.flatpakrepo)
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
+            'cf20e4831bceaaee74e9298b4ad7c4d2d51085d43f62d1c6a2d2977d2f421e00'
             '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a')
 
 prepare() {
@@ -75,18 +76,9 @@
   cd $pkgname
   make DESTDIR="$pkgdir" install
 
-  install -Dm644 /dev/stdin "$pkgdir/etc/profile.d/flatpak-bindir.sh" <<END
-if [ -d "\$HOME" ] && [ -d "\$HOME/.local/share/flatpak/exports/bin" ]; then
-  PATH="\$PATH:\$HOME/.local/share/flatpak/exports/bin"
-fi
-if [ -d /var/lib/flatpak/exports/bin ]; then
-  PATH="\$PATH:/var/lib/flatpak/exports/bin"
-fi
-END
+  install -Dt "$pkgdir/etc/profile.d" -m644 ../flatpak-bindir.sh
+  install -Dt "$pkgdir/usr/share/flatpak" -m644 ../flathub.flatpakrepo
 
-  install -Dm644 "$srcdir/flathub.flatpakrepo" \
-    "$pkgdir/usr/share/flatpak/flathub.flatpakrepo"
-
   # Fixup mode to match polkit
   install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
 }

Added: flatpak-bindir.sh
===================================================================
--- flatpak-bindir.sh	                        (rev 0)
+++ flatpak-bindir.sh	2018-01-31 18:39:39 UTC (rev 315693)
@@ -0,0 +1,7 @@
+if [ -d "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then
+  PATH="$PATH:$HOME/.local/share/flatpak/exports/bin"
+fi
+
+if [ -d /var/lib/flatpak/exports/bin ]; then
+  PATH="$PATH:/var/lib/flatpak/exports/bin"
+fi