From 8379700a13e29b20e6d085b9936e2db728858102 Mon Sep 17 00:00:00 2001 From: Jakob Hauser Date: Sat, 16 Nov 2024 22:28:01 +0100 Subject: [PATCH] main/postmarketos-ui-xfce4: clean up package section (MR 5805) Use install "-t" option, avoiding to repeat the file name and allowing to add more than one file per command. Additionally sort the commands alphabetically per path. Exception is the lightdm autologin config file because it does a file renaming. Put this command to the end. --- main/postmarketos-ui-xfce4/APKBUILD | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD index 12e03c979..d1b305a13 100644 --- a/main/postmarketos-ui-xfce4/APKBUILD +++ b/main/postmarketos-ui-xfce4/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakko pkgname=postmarketos-ui-xfce4 pkgver=0.5.2 -pkgrel=6 +pkgrel=7 pkgdesc="(X11) Lightweight desktop (stylus recommended)" url="https://gitlab.postmarketos.org/postmarketOS/xfce4-phone" arch="noarch" @@ -58,23 +58,19 @@ package() { mkdir -p "$pkgdir"/etc/xdg/xfce4-phone cp -a "$builddir"/config/xfce4 "$pkgdir"/etc/xdg/xfce4-phone/xfce4 - install -Dm644 "$srcdir"/10_onboard.gschema.override \ - "$pkgdir"/usr/share/glib-2.0/schemas/10_onboard.gschema.override + install -Dm644 -t "$pkgdir"/etc/profile.d \ + "$srcdir"/enable-scrollbars.sh \ + "$srcdir"/xfce4-phone.sh + + install -Dm644 -t "$pkgdir"/etc/xdg/xfce4-phone/autostart \ + "$srcdir"/onboard-autostart.desktop \ + "$srcdir"/unclutter-xfixes.desktop + + install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \ + "$srcdir"/10_onboard.gschema.override install -Dm644 "$srcdir"/64-lightdm-autologin.conf \ "$pkgdir"/usr/share/lightdm/lightdm.conf.d/64-autologin.conf - - install -Dm644 "$srcdir"/enable-scrollbars.sh \ - "$pkgdir"/etc/profile.d/enable-scrollbars.sh - - install -Dm644 "$srcdir"/onboard-autostart.desktop \ - "$pkgdir"/etc/xdg/xfce4-phone/autostart/onboard-autostart.desktop - - install -Dm644 "$srcdir"/unclutter-xfixes.desktop \ - "$pkgdir"/etc/xdg/xfce4-phone/autostart/unclutter-xfixes.desktop - - install -Dm644 "$srcdir"/xfce4-phone.sh \ - "$pkgdir"/etc/profile.d/xfce4-phone.sh } openrc() {