Skip to content

Commit

Permalink
Insist that Flatpak installs use --noninteractive
Browse files Browse the repository at this point in the history
  • Loading branch information
strugee committed Oct 23, 2024
1 parent f2a6f81 commit a9837c0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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`.'
Expand Down

0 comments on commit a9837c0

Please sign in to comment.