From 1f6d6f2da87912a2e716bc1f9084228c627c617a Mon Sep 17 00:00:00 2001
From: Benjamin Sherman <benjamin@holyarmy.org>
Date: Sat, 17 Jun 2023 22:10:41 -0500
Subject: [PATCH] fix: install supergfxctl-plasmoid (#121)

Corrects a problem where this was failing to install due to the
ublue-os-nvidia-addons RPM disabling the required COPR repo.

Fixes #99 again
---
 install.Containerfile |  1 -
 install.sh            | 33 +++++++--------------------------
 packages.json         | 36 ------------------------------------
 3 files changed, 7 insertions(+), 63 deletions(-)
 delete mode 100644 packages.json

diff --git a/install.Containerfile b/install.Containerfile
index 1de69420..4b58766e 100644
--- a/install.Containerfile
+++ b/install.Containerfile
@@ -14,7 +14,6 @@ COPY --from=${AKMODS_CACHE}:${AKMODS_VERSION}-${NVIDIA_MAJOR_VERSION} / .
 
 COPY install.sh /tmp/install.sh
 COPY post-install.sh /tmp/post-install.sh
-COPY packages.json /tmp/packages.json
 RUN /tmp/install.sh
 RUN /tmp/post-install.sh
 RUN rm -rf /tmp/* /var/*
diff --git a/install.sh b/install.sh
index f74fde67..59ade51a 100755
--- a/install.sh
+++ b/install.sh
@@ -4,17 +4,6 @@ set -ouex pipefail
 
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo
 
-INCLUDED_PACKAGES=($(jq -r "[(.all.include | (.all, select(.\"$IMAGE_NAME\" != null).\"$IMAGE_NAME\")[]), \
-                             (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (.all, select(.\"$IMAGE_NAME\" != null).\"$IMAGE_NAME\")[])] \
-                             | sort | unique[]" /tmp/packages.json))
-EXCLUDED_PACKAGES=($(jq -r "[(.all.exclude | (.all, select(.\"$IMAGE_NAME\" != null).\"$IMAGE_NAME\")[]), \
-                             (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (.all, select(.\"$IMAGE_NAME\" != null).\"$IMAGE_NAME\")[])] \
-                             | sort | unique[]" /tmp/packages.json))
-
-if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then
-    EXCLUDED_PACKAGES=($(rpm -qa --queryformat='%{NAME} ' ${EXCLUDED_PACKAGES[@]}))
-fi
-
 install -D /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/nvidia-container-runtime.repo \
     /etc/yum.repos.d/nvidia-container-runtime.repo
 install -D /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/lukenukem-asus-linux.repo \
@@ -24,22 +13,14 @@ install -D /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/jhyub-supergfxctl-plasmo
 
 source /var/cache/akmods/nvidia-vars
 
+if [[ "${IMAGE_NAME}" == "kinoite" ]]; then
+    VARIANT_PKGS="supergfxctl-plasmoid"
+else
+    VARIANT_PKGS=""
+fi
+
 rpm-ostree install \
     xorg-x11-drv-${NVIDIA_PACKAGE_NAME}-{,cuda-,devel-,kmodsrc-,power-}${NVIDIA_FULL_VERSION} \
-    nvidia-container-toolkit nvidia-vaapi-driver supergfxctl \
+    nvidia-container-toolkit nvidia-vaapi-driver supergfxctl ${VARIANT_PKGS} \
     /var/cache/akmods/${NVIDIA_PACKAGE_NAME}/kmod-${NVIDIA_PACKAGE_NAME}-${KERNEL_VERSION}-${NVIDIA_AKMOD_VERSION}.fc${RELEASE}.rpm \
     /tmp/ublue-os-nvidia-addons/rpmbuild/RPMS/noarch/ublue-os-nvidia-addons-*.rpm
-
-if [[ "${#INCLUDED_PACKAGES[@]}" -gt 0 && "${#EXCLUDED_PACKAGES[@]}" -eq 0 ]]; then
-    rpm-ostree install \
-        ${INCLUDED_PACKAGES[@]}
-elif [[ "${#INCLUDED_PACKAGES[@]}" -eq 0 && "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then
-    rpm-ostree override remove \
-        ${EXCLUDED_PACKAGES[@]}
-elif [[ "${#INCLUDED_PACKAGES[@]}" -gt 0 && "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then
-    rpm-ostree override remove \
-        ${EXCLUDED_PACKAGES[@]} \
-        $(printf -- "--install=%s " ${INCLUDED_PACKAGES[@]})
-else
-    echo "No packages to install."
-fi
diff --git a/packages.json b/packages.json
deleted file mode 100644
index d773557f..00000000
--- a/packages.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "all": {
-        "include": {
-            "all": [],
-            "silverblue": [],
-            "kinoite": [],
-            "lxqt": [],
-            "mate": [],
-            "sericea": [],
-            "vauxite": []
-        },
-        "exclude": {
-            "all": [],
-            "mate": []
-        }
-    },
-    "37": {
-        "include": {
-            "all": [],
-            "mate": []
-        },
-        "exclude": {
-            "all": []
-        }
-    },
-    "38": {
-        "include": {
-            "all": [],
-            "mate": [],
-            "kinoite":[]
-        },
-        "exclude": {
-            "all": []
-        }
-    }
-}