feat(bling): Install tainted repos also in rpmfusion submodule

blue-build · Dec 8, 2024 · 8ab382d · 8ab382d
1 parent 27b16bc
commit 8ab382d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/modules/bling/installers/rpmfusion.sh b/modules/bling/installers/rpmfusion.sh
@@ -14,11 +14,25 @@ if ! rpm -q rpmfusion-free-release &>/dev/null || ! rpm -q rpmfusion-nonfree-rel
       "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-${OS_VERSION}.noarch.rpm"
   elif ! rpm -q rpmfusion-free-release &>/dev/null; then
     rpm-ostree install \
-      "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-free-release-${OS_VERSION}.noarch.rpm"
+      "https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-${OS_VERSION}.noarch.rpm"
   elif ! rpm -q rpmfusion-nonfree-release &>/dev/null; then
     rpm-ostree install \
       "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-${OS_VERSION}.noarch.rpm"
   fi
+  echo "Installing tainted RPMFusion repos"
+  if ! rpm -q rpmfusion-free-release-tainted &>/dev/null || ! rpm -q rpmfusion-nonfree-release-tainted &>/dev/null; then
+  echo "Running RPMFusion repo install..."
+  if ! rpm -q rpmfusion-free-release-tainted &>/dev/null && ! rpm -q rpmfusion-nonfree-release-tainted &>/dev/null; then
+    rpm-ostree install \
+      rpmfusion-free-release-tainted \
+      rpmfusion-nonfree-release-tainted
+  elif ! rpm -q rpmfusion-free-release-tainted &>/dev/null; then
+    rpm-ostree install \
+      rpmfusion-free-release-tainted
+  elif ! rpm -q rpmfusion-nonfree-release-tainted &>/dev/null; then
+    rpm-ostree install \
+      rpmfusion-nonfree-release-tainted
+  fi 
   # check if negativo17 repo is installed
   if [[ -n "${NEGATIVO_REPO_FILE}" ]]; then
     echo "Making sure that Negativo17 repo is disabled"

diff --git a/modules/bling/module.yml b/modules/bling/module.yml
@@ -3,7 +3,7 @@ shortdesc: The bling module can be used to pull in small "bling" into your image
 example: |
   type: bling
   install:
-      - rpmfusion # install RPMFusion repos, disable negativo17 repos if installed
+      - rpmfusion # install RPMFusion repos, including tainted repos & disable negativo17 repos if installed
       - negativo17 # install negativo17 repos and set priority to 90, uninstall RPMFusion repos if installed
       - ublue-update # https://github.com/ublue-os/ublue-update
       - 1password # install 1Password (stable) and `op` CLI tool