From f2a6f81a39ac005024adbebf15e06d33920aa55e Mon Sep 17 00:00:00 2001 From: AJ Jordan Date: Wed, 23 Oct 2024 03:09:04 -0400 Subject: [PATCH] Fix another cosmetic linter error --- build.sh | 2 +- lint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 38d663c..fd59b18 100755 --- a/build.sh +++ b/build.sh @@ -24,7 +24,7 @@ flatpak install --system com.obsproject.Studio # This MUST be from Flathub and n rpm-ostree install libreoffice nextcloud-client nextcloud-client-nautilus systemctl enable seagl-init-system-flatpak.service -mv /var/lib/flatpak /usr/lib/seagl-flatpak # Hack to satisfy the linter: --system +mv /var/lib/flatpak /usr/lib/seagl-flatpak ### Configure system diff --git a/lint.sh b/lint.sh index f1d93b8..0984b79 100755 --- a/lint.sh +++ b/lint.sh @@ -7,7 +7,7 @@ trap 'echo Failed!' ERR # See 8f01ed1063e61407dc71f01863b0256f5082fd94 for rationale echo 'Checking that all `flatpak` invocations pass `--system`.' # We use () to make this a subshell to avoid ! not triggering a `set -e` bailout; see bash(1)'s documentation on this flag for more -( ! grep -n flatpak *.sh | grep -v -- --system ) +( ! grep -n flatpak *.sh | grep -ve systemctl -e /var/lib/flatpak | grep -v -- --system ) for i in bin/* sbin/*; do echo 'Checking that `'"$i"'` contains `set -euo pipefail`.'