Skip to content

Commit 05370d4

Browse files
committed
Remove Flathub setup code
Seemingly this is shipped by Ublue upstream now.
1 parent d9a46c6 commit 05370d4

4 files changed

Lines changed: 1 addition & 12 deletions

File tree

Containerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${SOURCE_TAG}
5151

5252
COPY build.sh /tmp/build.sh
5353
COPY osrelease.sh /tmp/osrelease.sh
54-
COPY flathub.flatpakrepo /tmp/flathub.flatpakrepo
5554
# Apparently Buildah doesn't support --checksum :/
5655
# TODO --checksum=shas56:b36536d919a8fcb5de966f846bd6ca70dc6af3295bc64b1b9dde2b50c07c873c
5756
ADD https://extensions.gnome.org/extension-data/appmenu-is-backfthx.v3.shell-extension.zip /tmp/

build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ RELEASE="$(rpm -E %fedora)"
1313
# List of rpmfusion packages can be found here:
1414
# https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1
1515

16-
flatpak remote-add --system flathub --from /tmp/flathub.flatpakrepo
17-
1816
# General system packages
1917
rpm-ostree install jq age seahorse gedit
2018
# Streaming machine packages

flathub.flatpakrepo

Lines changed: 0 additions & 8 deletions
This file was deleted.

lint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ trap 'echo Failed!' ERR
77
# See 8f01ed1063e61407dc71f01863b0256f5082fd94 for rationale
88
echo 'Checking that all `flatpak` invocations pass `--noninteractive --system`.'
99
# 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
10-
( ! grep -rn --exclude-dir=.git flatpak | grep -ve systemctl -e /var/lib/flatpak -e 'remote-add.*--system' -e flathub.flatpakrepo | grep -v -- '--noninteractive --system')
10+
( ! grep -rn --exclude-dir=.git flatpak | grep -ve systemctl -e /var/lib/flatpak | grep -v -- '--noninteractive --system')
1111

1212
for i in bin/* sbin/*; do
1313
echo 'Checking that `'"$i"'` contains `set -euo pipefail`.'

0 commit comments

Comments
 (0)