Skip to content

Commit 5390fa8

Browse files
Copilotcastrojo
andcommitted
fix: skip terra repos for Fedora 43+
Co-authored-by: castrojo <1264109+castrojo@users.noreply.github.com>
1 parent 8e678c7 commit 5390fa8

2 files changed

Lines changed: 23 additions & 13 deletions

File tree

build_files/base/02-install-copr-repos.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ dnf5 -y copr enable ublue-os/packages
1414
# Add Nerd Fonts Repo
1515
dnf5 -y copr enable che/nerd-fonts
1616

17-
# Add Terra
18-
dnf5 -y install --nogpgcheck --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' terra-release
19-
dnf5 -y install terra-release-extras || true
20-
dnf5 config-manager setopt "terra*".enabled=0
17+
# Add Terra (skip for Fedora 43+)
18+
if [[ "${FEDORA_MAJOR_VERSION}" -lt "43" ]]; then
19+
dnf5 -y install --nogpgcheck --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' terra-release
20+
dnf5 -y install terra-release-extras || true
21+
dnf5 config-manager setopt "terra*".enabled=0
22+
fi
2123

2224
echo "::endgroup::"

build_files/base/05-override-install.sh

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,24 @@ echo "::group:: ===$(basename "$0")==="
55
set -eoux pipefail
66

77

8-
# Enable Terra repo (Extras does not exist on F40)
8+
# Enable Terra repo (Extras does not exist on F40, skip for F43+)
99
# shellcheck disable=SC2016
10-
dnf5 -y swap \
11-
--repo="terra, terra-extras" \
12-
gnome-shell gnome-shell
13-
dnf5 versionlock add gnome-shell
14-
dnf5 -y swap \
15-
--repo="terra, terra-extras" \
16-
switcheroo-control switcheroo-control
17-
dnf5 versionlock add switcheroo-control
10+
if [[ "${FEDORA_MAJOR_VERSION}" -lt "43" ]]; then
11+
dnf5 -y swap \
12+
--repo="terra, terra-extras" \
13+
gnome-shell gnome-shell
14+
dnf5 versionlock add gnome-shell
15+
dnf5 -y swap \
16+
--repo="terra, terra-extras" \
17+
switcheroo-control switcheroo-control
18+
dnf5 versionlock add switcheroo-control
19+
else
20+
# For F43+, swap without specifying terra repo
21+
dnf5 -y swap gnome-shell gnome-shell
22+
dnf5 versionlock add gnome-shell
23+
dnf5 -y swap switcheroo-control switcheroo-control
24+
dnf5 versionlock add switcheroo-control
25+
fi
1826

1927
# Fix for ID in fwupd
2028
dnf5 -y swap \

0 commit comments

Comments
 (0)