From dc27e42783c7526a1dba7e00f57f126ddabfe267 Mon Sep 17 00:00:00 2001
From: m2Giles <69128853+m2Giles@users.noreply.github.com>
Date: Sat, 27 Apr 2024 00:11:13 -0400
Subject: [PATCH 1/3] fix(Aurora): Restore x11 for 40

chore: add set -x to build scripts
---
 build_files/base/aurora-changes.sh       |  2 +-
 build_files/base/branding.sh             |  3 +--
 build_files/base/build-base.sh           |  5 ++---
 build_files/base/copr-repos.sh           |  2 +-
 build_files/base/fetch-install.sh        | 10 ++++++++--
 build_files/base/fetch-quadlets.sh       |  2 +-
 build_files/base/install-akmods.sh       |  2 +-
 build_files/base/install-tmp.sh          |  7 -------
 build_files/base/nvidia-explicit-sync.sh | 16 ----------------
 build_files/base/nvidia.sh               | 11 +++++++++++
 build_files/dx/branding-dx.sh            |  2 +-
 build_files/dx/build-dx.sh               |  2 +-
 build_files/dx/copr-repos-dx.sh          |  2 +-
 build_files/dx/fetch-install-dx.sh       |  2 +-
 build_files/dx/systemd-dx.sh             |  2 +-
 build_files/shared/image-info.sh         |  4 ++--
 16 files changed, 33 insertions(+), 41 deletions(-)
 delete mode 100644 build_files/base/install-tmp.sh
 delete mode 100644 build_files/base/nvidia-explicit-sync.sh
 create mode 100644 build_files/base/nvidia.sh

diff --git a/build_files/base/aurora-changes.sh b/build_files/base/aurora-changes.sh
index b8854f7328b..183a09ff677 100644
--- a/build_files/base/aurora-changes.sh
+++ b/build_files/base/aurora-changes.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 if [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then
     ln -sf ../places/distributor-logo.svg /usr/share/icons/hicolor/scalable/apps/start-here.svg
diff --git a/build_files/base/branding.sh b/build_files/base/branding.sh
index 4d464a4712d..43c153d1e82 100644
--- a/build_files/base/branding.sh
+++ b/build_files/base/branding.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
-
+set -ouex pipefail
 
 # Branding for Bluefin/Aurora
 if test "$BASE_IMAGE_NAME" = "silverblue"; then
diff --git a/build_files/base/build-base.sh b/build_files/base/build-base.sh
index 43538d65179..997d56ed5aa 100644
--- a/build_files/base/build-base.sh
+++ b/build_files/base/build-base.sh
@@ -1,13 +1,12 @@
 #!/usr/bin/bash
 # shellcheck disable=SC1091
 
-set -oue pipefail
+set -ouex pipefail
 
 . /tmp/build/copr-repos.sh
-. /tmp/build/nvidia-explicit-sync.sh
 . /tmp/build/install-akmods.sh
 . /tmp/build/packages.sh
-. /tmp/build/fetch-install.sh
+. /tmp/build/nvidia.sh
 . /tmp/build/image-info.sh
 . /tmp/build/fetch-quadlets.sh
 . /tmp/build/font-install.sh
diff --git a/build_files/base/copr-repos.sh b/build_files/base/copr-repos.sh
index f3b6191a03d..00bcad01ad3 100644
--- a/build_files/base/copr-repos.sh
+++ b/build_files/base/copr-repos.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 # Add Staging repo
 wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo
diff --git a/build_files/base/fetch-install.sh b/build_files/base/fetch-install.sh
index 6d10d0acbf0..4f2db525dfc 100644
--- a/build_files/base/fetch-install.sh
+++ b/build_files/base/fetch-install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 # Starship Shell Prompt
 curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz"
@@ -21,4 +21,10 @@ wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remo
 pip install --prefix=/usr topgrade
 
 # Install ublue-update -- breaks with packages.json
-rpm-ostree install ublue-update
\ No newline at end of file
+rpm-ostree install ublue-update
+
+# Consolidate Just Files
+find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just
+
+# Copy over ublue-update config
+cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml
\ No newline at end of file
diff --git a/build_files/base/fetch-quadlets.sh b/build_files/base/fetch-quadlets.sh
index 0e63af1c3fd..fc02e540fc9 100755
--- a/build_files/base/fetch-quadlets.sh
+++ b/build_files/base/fetch-quadlets.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -oue pipefail
+set -ouex pipefail
 
 # Make Directory
 mkdir -p /usr/etc/containers/systemd/users
diff --git a/build_files/base/install-akmods.sh b/build_files/base/install-akmods.sh
index 597ee702e0a..5d922ebbb62 100755
--- a/build_files/base/install-akmods.sh
+++ b/build_files/base/install-akmods.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
 wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo
diff --git a/build_files/base/install-tmp.sh b/build_files/base/install-tmp.sh
deleted file mode 100644
index cfdd9802f46..00000000000
--- a/build_files/base/install-tmp.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/bash
-
-set -ouex pipefail
-
-find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just
-
-cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml
\ No newline at end of file
diff --git a/build_files/base/nvidia-explicit-sync.sh b/build_files/base/nvidia-explicit-sync.sh
deleted file mode 100644
index 6b24a97035b..00000000000
--- a/build_files/base/nvidia-explicit-sync.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/bash
-
-# Install Explicit Sync Patches on Nvidia builds
-if [[ "${IMAGE_FLAVOR}" =~ "nvidia" && "${IMAGE_FLAVOR}" =~ "39" ]]; then
-    wget https://copr.fedorainfracloud.org/coprs/gloriouseggroll/nvidia-explicit-sync/repo/fedora-$(rpm -E %fedora)/gloriouseggroll-nvidia-explicit-sync-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo
-    rpm-ostree override replace \
-    --experimental \
-    --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \
-        xorg-x11-server-Xwayland
-    rpm-ostree override replace \
-    --experimental \
-    --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \
-        egl-wayland \
-        || true
-    rm /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo
-fi
\ No newline at end of file
diff --git a/build_files/base/nvidia.sh b/build_files/base/nvidia.sh
new file mode 100644
index 00000000000..ba1b6bbf839
--- /dev/null
+++ b/build_files/base/nvidia.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+
+set -ouex pipefail
+
+# Nvidia Configurations
+if [[ "${IMAGE_FLAVOR}" =~ "nvidia" ]]; then
+    # Restore x11 for Nvidia Images
+    if [[ "${BASE_IMAGE_NAME}" =~ "kinoite" && "${FEDORA_MAJOR_VERSION}" -gt "39" ]]; then
+        rpm-ostree install plasma-workspace-x11
+    fi
+fi
\ No newline at end of file
diff --git a/build_files/dx/branding-dx.sh b/build_files/dx/branding-dx.sh
index 9af77d2d0b1..2fe4d8d21c9 100644
--- a/build_files/dx/branding-dx.sh
+++ b/build_files/dx/branding-dx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 if test "$BASE_IMAGE_NAME" = "silverblue"; then
     sed -i '/^PRETTY_NAME/s/Bluefin/Bluefin-dx/' /usr/lib/os-release
diff --git a/build_files/dx/build-dx.sh b/build_files/dx/build-dx.sh
index f86cb69b43c..40c21e23e50 100644
--- a/build_files/dx/build-dx.sh
+++ b/build_files/dx/build-dx.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 # shellcheck disable=SC1091
 
-set -oue pipefail
+set -ouex pipefail
 
 # Apply IP Forwarding before installing Docker to prevent messing with LXC networking
 sysctl -p
diff --git a/build_files/dx/copr-repos-dx.sh b/build_files/dx/copr-repos-dx.sh
index 8de259e53bb..27b32cc86d2 100644
--- a/build_files/dx/copr-repos-dx.sh
+++ b/build_files/dx/copr-repos-dx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 #incus, lxc, lxd
 wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo
diff --git a/build_files/dx/fetch-install-dx.sh b/build_files/dx/fetch-install-dx.sh
index e53f9154d57..c02dd419074 100644
--- a/build_files/dx/fetch-install-dx.sh
+++ b/build_files/dx/fetch-install-dx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 curl -Lo ./kind "https://github.com/kubernetes-sigs/kind/releases/latest/download/kind-$(uname)-amd64"
 chmod +x ./kind
diff --git a/build_files/dx/systemd-dx.sh b/build_files/dx/systemd-dx.sh
index abddf532052..5033cd449a4 100644
--- a/build_files/dx/systemd-dx.sh
+++ b/build_files/dx/systemd-dx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 systemctl enable docker.socket
 systemctl enable podman.socket
diff --git a/build_files/shared/image-info.sh b/build_files/shared/image-info.sh
index a1866a9dc67..2e9c1e30874 100755
--- a/build_files/shared/image-info.sh
+++ b/build_files/shared/image-info.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-set -oue pipefail
+set -ouex pipefail
 
 IMAGE_INFO="/usr/share/ublue-os/image-info.json"
 IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME"
 
 case $FEDORA_MAJOR_VERSION in
-  38)
+  39)
     IMAGE_TAG="gts"
     ;;
   *)

From 3840aa4919e2dc781901b2d7eed55ef3baa8ae58 Mon Sep 17 00:00:00 2001
From: m2Giles <69128853+m2Giles@users.noreply.github.com>
Date: Sat, 27 Apr 2024 00:23:04 -0400
Subject: [PATCH 2/3] fix: remove reference deleted file

---
 build_files/base/build-base.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build_files/base/build-base.sh b/build_files/base/build-base.sh
index 997d56ed5aa..096a1012fa9 100644
--- a/build_files/base/build-base.sh
+++ b/build_files/base/build-base.sh
@@ -10,7 +10,6 @@ set -ouex pipefail
 . /tmp/build/image-info.sh
 . /tmp/build/fetch-quadlets.sh
 . /tmp/build/font-install.sh
-. /tmp/build/install-tmp.sh
 . /tmp/build/systemd.sh
 . /tmp/build/bluefin-changes.sh
 . /tmp/build/aurora-changes.sh

From 1e96bd2435414968712e51950ce22852c4f846cd Mon Sep 17 00:00:00 2001
From: m2Giles <69128853+m2Giles@users.noreply.github.com>
Date: Sat, 27 Apr 2024 02:45:45 -0400
Subject: [PATCH 3/3] fix: missing script

---
 build_files/base/build-base.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_files/base/build-base.sh b/build_files/base/build-base.sh
index 096a1012fa9..17ec29c4481 100644
--- a/build_files/base/build-base.sh
+++ b/build_files/base/build-base.sh
@@ -8,6 +8,7 @@ set -ouex pipefail
 . /tmp/build/packages.sh
 . /tmp/build/nvidia.sh
 . /tmp/build/image-info.sh
+. /tmp/build/fetch-install.sh
 . /tmp/build/fetch-quadlets.sh
 . /tmp/build/font-install.sh
 . /tmp/build/systemd.sh