From a9837c0c5758be7d92693bb3f1028ee207d07006 Mon Sep 17 00:00:00 2001 From: AJ Jordan Date: Wed, 23 Oct 2024 03:15:40 -0400 Subject: [PATCH] Insist that Flatpak installs use --noninteractive --- build.sh | 2 +- lint.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index fd59b18..28c9879 100755 --- a/build.sh +++ b/build.sh @@ -19,7 +19,7 @@ flatpak remote-add --system flathub --from /tmp/flathub.flatpakrepo rpm-ostree install jq age # Streaming machine packages rpm-ostree install mpv yt-dlp zenity -flatpak install --system com.obsproject.Studio # This MUST be from Flathub and not Fedora repos to have OpenH264 support +flatpak install --noninteractive --system com.obsproject.Studio # This MUST be from Flathub and not Fedora repos to have OpenH264 support # Presentation machine packages rpm-ostree install libreoffice nextcloud-client nextcloud-client-nautilus diff --git a/lint.sh b/lint.sh index 0984b79..0910492 100755 --- a/lint.sh +++ b/lint.sh @@ -5,9 +5,9 @@ set -euo pipefail trap 'echo Failed!' ERR # See 8f01ed1063e61407dc71f01863b0256f5082fd94 for rationale -echo 'Checking that all `flatpak` invocations pass `--system`.' +echo 'Checking that all `flatpak` invocations pass `--noninteractive --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 -ve systemctl -e /var/lib/flatpak | grep -v -- --system ) +( ! grep -n flatpak *.sh | grep -ve systemctl -e /var/lib/flatpak -e 'remote-add.*--system' | grep -v -- '--noninteractive --system') for i in bin/* sbin/*; do echo 'Checking that `'"$i"'` contains `set -euo pipefail`.'