From 7674f3525173bcf321773d8b3daa840b259fec3b Mon Sep 17 00:00:00 2001 From: Jared Cervantes <76603258+Jaredy899@users.noreply.github.com> Date: Fri, 25 Apr 2025 14:00:20 -0400 Subject: [PATCH 1/2] correct rpm logic --- core/tabs/system-setup/gaming-setup.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/tabs/system-setup/gaming-setup.sh b/core/tabs/system-setup/gaming-setup.sh index ecd97c548..b5f62a1c6 100755 --- a/core/tabs/system-setup/gaming-setup.sh +++ b/core/tabs/system-setup/gaming-setup.sh @@ -40,15 +40,15 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES $DISTRO_DEPS ;; dnf) - if [ "$(rpm -E %fedora)" -le 41 ]; then - "$ESCALATION_TOOL" "$PACKAGER" install ffmpeg ffmpeg-libs -y - "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES - else - printf "%b\n" "${CYAN}Fedora < 41 detected. Installing rpmfusion repos.${RC}" - "$ESCALATION_TOOL" "$PACKAGER" install 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 -y + printf "%b\n" "${CYAN}Installing rpmfusion repos.${RC}" + "$ESCALATION_TOOL" "$PACKAGER" install 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 -y + if [ "$(rpm -E %fedora)" -le 40 ]; then "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable fedora-cisco-openh264 -y - "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES + else + "$ESCALATION_TOOL" "$PACKAGER" config-manager setopt --repo fedora-cisco-openh264 enabled=1 fi + + "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES ;; zypper) "$ESCALATION_TOOL" "$PACKAGER" -n install $DEPENDENCIES From aa5265ecd6a114a31b740696607c69968eea1dbd Mon Sep 17 00:00:00 2001 From: Jared Cervantes <76603258+Jaredy899@users.noreply.github.com> Date: Thu, 22 May 2025 13:24:48 -0400 Subject: [PATCH 2/2] Delete Fedora 40 logic Now that Fedora 40 is EOL, deleted install logic as I doubt few people will install gaming stuff on old fedora os. --- core/tabs/system-setup/gaming-setup.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/tabs/system-setup/gaming-setup.sh b/core/tabs/system-setup/gaming-setup.sh index b5f62a1c6..aab0e4016 100755 --- a/core/tabs/system-setup/gaming-setup.sh +++ b/core/tabs/system-setup/gaming-setup.sh @@ -42,12 +42,8 @@ installDepend() { dnf) printf "%b\n" "${CYAN}Installing rpmfusion repos.${RC}" "$ESCALATION_TOOL" "$PACKAGER" install 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 -y - if [ "$(rpm -E %fedora)" -le 40 ]; then - "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable fedora-cisco-openh264 -y - else - "$ESCALATION_TOOL" "$PACKAGER" config-manager setopt --repo fedora-cisco-openh264 enabled=1 - fi - + "$ESCALATION_TOOL" "$PACKAGER" config-manager setopt --repo fedora-cisco-openh264 enabled=1 + "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES ;; zypper)