From 865d90248b07b037e68108a70fc9bb238f45a9d5 Mon Sep 17 00:00:00 2001 From: Nick A <60294463+technicks89@users.noreply.github.com> Date: Sat, 18 Jul 2026 08:43:49 -0400 Subject: [PATCH 1/4] Split tainted Repository install out, so it can be installed if RPM Fusion is already installed --- .../system-setup/fedora/rpm-fusion-setup.sh | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/core/tabs/system-setup/fedora/rpm-fusion-setup.sh b/core/tabs/system-setup/fedora/rpm-fusion-setup.sh index e7c050867..b18c74382 100644 --- a/core/tabs/system-setup/fedora/rpm-fusion-setup.sh +++ b/core/tabs/system-setup/fedora/rpm-fusion-setup.sh @@ -9,27 +9,42 @@ installRPMFusion() { dnf) if [ ! -e /etc/yum.repos.d/rpmfusion-free.repo ] || [ ! -e /etc/yum.repos.d/rpmfusion-nonfree.repo ]; then printf "%b\n" "${YELLOW}Installing RPM Fusion...${RC}" - + "$ESCALATION_TOOL" "$PACKAGER" install -y \ "https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm" \ "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm" - + fedora_version=$(rpm -E %fedora) if [ "$fedora_version" -ge 41 ]; then "$ESCALATION_TOOL" "$PACKAGER" config-manager setopt fedora-cisco-openh264.enabled=1 else "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable fedora-cisco-openh264 fi - + "$ESCALATION_TOOL" "$PACKAGER" install -y rpmfusion-\*-appstream-data - + + else + printf "%b\n" "${GREEN}RPM Fusion already installed${RC}" + fi + ;; + *) + printf "%b\n" "${RED}Unsupported distribution: $DTYPE${RC}" + ;; + esac +} + +installRPMFusionTainted() { + case "$PACKAGER" in + dnf) + if [ ! rpm -q "rpmfusion-free-release-tainted" >/dev/null 2>&1 ] || [ ! rpm -q "rpmfusion-free-release-tainted" >/dev/null 2>&1 ]; then printf "%b\n" "${YELLOW}Do you want to install tainted repositories? [y/N]: ${RC}" read -r install_tainted + case "$install_tainted" in [Yy]*) printf "%b\n" "${YELLOW}Installing RPM Fusion tainted repositories...${RC}" "$ESCALATION_TOOL" "$PACKAGER" install -y rpmfusion-free-release-tainted rpmfusion-nonfree-release-tainted - + if [ "$fedora_version" -ge 41 ]; then "$ESCALATION_TOOL" "$PACKAGER" config-manager setopt rpmfusion-free-tainted.enabled=1 "$ESCALATION_TOOL" "$PACKAGER" config-manager setopt rpmfusion-nonfree-tainted.enabled=1 @@ -45,7 +60,7 @@ installRPMFusion() { ;; esac else - printf "%b\n" "${GREEN}RPM Fusion already installed${RC}" + printf "%b\n" "${GREEN}RPM Fusion Tainted already installed${RC}" fi ;; *) @@ -55,5 +70,5 @@ installRPMFusion() { } checkEnv -checkEscalationTool -installRPMFusion \ No newline at end of file +installRPMFusion +installRPMFusionTainted From 1e638b6d2fdb32e9739b26f7fca37b0e88387d4d Mon Sep 17 00:00:00 2001 From: Nick A <60294463+technicks89@users.noreply.github.com> Date: Sat, 18 Jul 2026 08:57:53 -0400 Subject: [PATCH 2/4] Fixed posix issue --- core/tabs/system-setup/fedora/rpm-fusion-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/system-setup/fedora/rpm-fusion-setup.sh b/core/tabs/system-setup/fedora/rpm-fusion-setup.sh index b18c74382..50e4478da 100644 --- a/core/tabs/system-setup/fedora/rpm-fusion-setup.sh +++ b/core/tabs/system-setup/fedora/rpm-fusion-setup.sh @@ -36,7 +36,7 @@ installRPMFusion() { installRPMFusionTainted() { case "$PACKAGER" in dnf) - if [ ! rpm -q "rpmfusion-free-release-tainted" >/dev/null 2>&1 ] || [ ! rpm -q "rpmfusion-free-release-tainted" >/dev/null 2>&1 ]; then + if ! rpm -q "rpmfusion-free-release-tainted" >/dev/null 2>&1 || ! rpm -q "rpmfusion-free-release-tainted" >/dev/null 2>&1; then printf "%b\n" "${YELLOW}Do you want to install tainted repositories? [y/N]: ${RC}" read -r install_tainted From 02feceba3a3e4d20366824b41a2b2d10a71cfb45 Mon Sep 17 00:00:00 2001 From: Nick A <60294463+technicks89@users.noreply.github.com> Date: Mon, 20 Jul 2026 19:59:42 -0400 Subject: [PATCH 3/4] fixed Fedora Version and duplicate checks --- core/tabs/system-setup/fedora/rpm-fusion-setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/tabs/system-setup/fedora/rpm-fusion-setup.sh b/core/tabs/system-setup/fedora/rpm-fusion-setup.sh index 50e4478da..9e65636b2 100644 --- a/core/tabs/system-setup/fedora/rpm-fusion-setup.sh +++ b/core/tabs/system-setup/fedora/rpm-fusion-setup.sh @@ -3,6 +3,7 @@ . ../../common-script.sh # https://rpmfusion.org/Configuration +FEDORA_VERSION=$(rpm -E %fedora) installRPMFusion() { case "$PACKAGER" in @@ -14,8 +15,7 @@ installRPMFusion() { "https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm" \ "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm" - fedora_version=$(rpm -E %fedora) - if [ "$fedora_version" -ge 41 ]; then + if [ "$FEDORA_VERSION" -ge 41 ]; then "$ESCALATION_TOOL" "$PACKAGER" config-manager setopt fedora-cisco-openh264.enabled=1 else "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable fedora-cisco-openh264 @@ -36,7 +36,7 @@ installRPMFusion() { installRPMFusionTainted() { case "$PACKAGER" in dnf) - if ! rpm -q "rpmfusion-free-release-tainted" >/dev/null 2>&1 || ! rpm -q "rpmfusion-free-release-tainted" >/dev/null 2>&1; then + if ! rpm -q "rpmfusion-free-release-tainted" >/dev/null 2>&1 || ! rpm -q "rpmfusion-nonfree-release-tainted" >/dev/null 2>&1; then printf "%b\n" "${YELLOW}Do you want to install tainted repositories? [y/N]: ${RC}" read -r install_tainted @@ -45,7 +45,7 @@ installRPMFusionTainted() { printf "%b\n" "${YELLOW}Installing RPM Fusion tainted repositories...${RC}" "$ESCALATION_TOOL" "$PACKAGER" install -y rpmfusion-free-release-tainted rpmfusion-nonfree-release-tainted - if [ "$fedora_version" -ge 41 ]; then + if [ "$FEDORA_VERSION" -ge 41 ]; then "$ESCALATION_TOOL" "$PACKAGER" config-manager setopt rpmfusion-free-tainted.enabled=1 "$ESCALATION_TOOL" "$PACKAGER" config-manager setopt rpmfusion-nonfree-tainted.enabled=1 else From 510996c8b78251066205790393a3f31f2c334139 Mon Sep 17 00:00:00 2001 From: Nick A <60294463+technicks89@users.noreply.github.com> Date: Mon, 20 Jul 2026 20:26:10 -0400 Subject: [PATCH 4/4] Updated to use FEDORA_VERSION variable where applicable --- core/tabs/system-setup/fedora/rpm-fusion-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tabs/system-setup/fedora/rpm-fusion-setup.sh b/core/tabs/system-setup/fedora/rpm-fusion-setup.sh index 9e65636b2..f7ab8facb 100644 --- a/core/tabs/system-setup/fedora/rpm-fusion-setup.sh +++ b/core/tabs/system-setup/fedora/rpm-fusion-setup.sh @@ -12,8 +12,8 @@ installRPMFusion() { printf "%b\n" "${YELLOW}Installing RPM Fusion...${RC}" "$ESCALATION_TOOL" "$PACKAGER" install -y \ - "https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm" \ - "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm" + "https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION).noarch.rpm" \ + "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm" if [ "$FEDORA_VERSION" -ge 41 ]; then "$ESCALATION_TOOL" "$PACKAGER" config-manager setopt fedora-cisco-openh264.enabled=1