From 12e5b7b530b20c67284298964c0d78db6002dd12 Mon Sep 17 00:00:00 2001
From: Tulip Blossom <tulilirockz@outlook.com>
Date: Sun, 8 Dec 2024 16:53:32 -0300
Subject: [PATCH] chore(aurora): remove all remaining aurora things from the
 system (#2027)

---
 Justfile                                           | 13 +------------
 just/bluefin-system.just                           | 14 ++------------
 system_files/dx/usr/libexec/bluefin-dx-kvmfr-setup |  2 +-
 system_files/dx/usr/libexec/bluefin-incus          |  2 +-
 system_files/shared/etc/profile.d/askpass.sh       |  9 +--------
 system_files/shared/usr/bin/ublue-rollback-helper  | 10 ++--------
 6 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/Justfile b/Justfile
index 28a189d740c..e475911ae9d 100644
--- a/Justfile
+++ b/Justfile
@@ -2,8 +2,6 @@ repo_organization := "ublue-os"
 rechunker_image := "ghcr.io/hhd-dev/rechunk:v1.0.1"
 iso_builder_image := "ghcr.io/jasonn3/build-container-installer:v1.2.3"
 images := '(
-    [aurora]=aurora
-    [aurora-dx]=aurora-dx
     [bluefin]=bluefin
     [bluefin-dx]=bluefin-dx
 )'
@@ -103,10 +101,6 @@ validate image="" tag="" flavor="":
         echo "Invalid flavor..."
         exit 1
     fi
-    if [[ "$checktag" =~ gts && "$checkimage" =~ aurora ]]; then
-        echo "Aurora Does not build GTS..."
-        exit 1
-    fi
     if [[ ! "$checktag" =~ latest && "$checkflavor" =~ hwe|asus|surface ]]; then
         echo "HWE images are only built on latest..."
         exit 1
@@ -485,12 +479,7 @@ build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":
         just sudoif podman image scp "${UID}"@localhost::"${IMAGE_FULL}" root@localhost::"${IMAGE_FULL}"
     fi
 
-    # Flatpak list for bluefin/aurora
-    if [[ "${image_name}" =~ bluefin ]]; then
-        FLATPAK_DIR_SHORTNAME="bluefin_flatpaks"
-    elif [[ "${image_name}" =~ aurora ]]; then
-        FLATPAK_DIR_SHORTNAME="aurora_flatpaks"
-    fi
+    FLATPAK_DIR_SHORTNAME="bluefin_flatpaks"
 
     # Generate Flatpak List
     TEMP_FLATPAK_INSTALL_DIR="$(mktemp -d -p /tmp flatpak-XXXXX)"
diff --git a/just/bluefin-system.just b/just/bluefin-system.just
index ecafba01b87..16b974e741e 100644
--- a/just/bluefin-system.just
+++ b/just/bluefin-system.just
@@ -53,11 +53,7 @@ toggle-devmode:
             exit 0
         fi
         echo "Rebasing to a developer image"
-        if [[ "${CURRENT_IMAGE}" =~ "bluefin" ]]; then
-            NEW_IMAGE=$(sed "s/bluefin/bluefin-dx/" <<< $CURRENT_IMAGE)
-        elif [[ "${CURRENT_IMAGE}" =~ "aurora" ]]; then
-            NEW_IMAGE=$(sed "s/aurora/aurora-dx/" <<< $CURRENT_IMAGE)
-        fi
+        NEW_IMAGE=$(sed "s/bluefin/bluefin-dx/" <<< $CURRENT_IMAGE)
         rpm-ostree rebase $NEW_IMAGE
         echo -e "\nUse `ujust dx-group` to add your user to the correct groups and complete the installation"
     fi
@@ -219,13 +215,7 @@ configure-vfio ACTION="":
 [private]
 install-system-flatpaks:
     #!/usr/bin/bash
-    IMAGE_INFO="/usr/share/ublue-os/image-info.json"
-    BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
-    if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
-        FLATPAKS="bluefin_flatpaks/flatpaks"
-    elif [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
-        FLATPAKS="aurora_flatpaks/flatpaks"
-    fi
+    FLATPAKS="bluefin_flatpaks/flatpaks"
     FLATPAK_LIST="$(curl https://raw.githubusercontent.com/ublue-os/bluefin/main/${FLATPAKS} | tr '\n' ' ')"
     flatpak --system -y install --or-update ${FLATPAK_LIST}
 
diff --git a/system_files/dx/usr/libexec/bluefin-dx-kvmfr-setup b/system_files/dx/usr/libexec/bluefin-dx-kvmfr-setup
index f711cee379d..4d2cf1ab441 100755
--- a/system_files/dx/usr/libexec/bluefin-dx-kvmfr-setup
+++ b/system_files/dx/usr/libexec/bluefin-dx-kvmfr-setup
@@ -6,7 +6,7 @@ echo "$(Urllink "https://looking-glass.io/docs/rc/ivshmem_kvmfr/#libvirt" "This
 echo "The ublue team packages the kvmfr module only because it has to be supplied with the system image while using an atomic desktop."
 echo "If you do plan to use Looking Glass, please $(Urllink "https://universal-blue.discourse.group/docs?topic=956" "follow the guide here") on how to compile it for your system."
 echo "To use the kvmfr module after enabling it, just add and edit the xml for libvirt from the documentation in the first link."
-echo "Since we package the kvmfr module please open kvmfr related issues you have on Bluefin or Aurora and tag me"
+echo "Since we package the kvmfr module please open kvmfr related issues you have on Bluefin and tag me"
 echo "in the $(Urllink "https://discord.gg/WEu6BdFEtp" "Universal Blue Discord") or the $(Urllink "https://github.com/ublue-os/bluefin/issues" "Bluefin Github issue tracker")."
 echo "~ @HikariKnight"
 
diff --git a/system_files/dx/usr/libexec/bluefin-incus b/system_files/dx/usr/libexec/bluefin-incus
index b4b2297fa7b..9cccaf22ea4 100755
--- a/system_files/dx/usr/libexec/bluefin-incus
+++ b/system_files/dx/usr/libexec/bluefin-incus
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # All the pieces needed to enable incus on Developer Experience Hosts
-# This script is meant to be run on a {bluefin,aurora}-dx host
+# This script is meant to be run on a bluefin-dx host
 if [ "$EUID" -eq 0 ]
 then
     echo "This script should not be run as root"
diff --git a/system_files/shared/etc/profile.d/askpass.sh b/system_files/shared/etc/profile.d/askpass.sh
index 51a846ea6e5..27c4a9c809b 100644
--- a/system_files/shared/etc/profile.d/askpass.sh
+++ b/system_files/shared/etc/profile.d/askpass.sh
@@ -1,11 +1,4 @@
 #!/usr/bin/bash
 
-IMAGE_INFO="/usr/share/ublue-os/image-info.json"
-BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
-
-if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
-  SUDO_ASKPASS='/usr/bin/ksshaskpass'
-elif [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
-  SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass'
-fi
+SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass'
 export SUDO_ASKPASS
diff --git a/system_files/shared/usr/bin/ublue-rollback-helper b/system_files/shared/usr/bin/ublue-rollback-helper
index 0f5ef77ee2a..42bba545f0d 100755
--- a/system_files/shared/usr/bin/ublue-rollback-helper
+++ b/system_files/shared/usr/bin/ublue-rollback-helper
@@ -14,14 +14,8 @@ function list_tags(){
 function rebase_helper(){
     base_image="ghcr.io/ublue-os/${IMAGE_NAME}"
     echo "Which Tag would you like to rebase to?"
-    CHANNELS=(latest stable stable-daily)
-    # Aurora currently does not have GTS (02-11-2024)
-    if [[ "${IMAGE_NAME}" =~ "aurora" ]]; then
-        echo "The default selection is stable (weekly builds) and stable-daily (daily builds) are for enthusiasts, and latest is for testers"
-    else
-        CHANNELS+=(gts)
-        echo "The default selection is gts, stable (weekly builds) and stable-daily (daily builds) are for enthusiasts, and latest is for testers"
-    fi
+    CHANNELS=(latest stable stable-daily gts)
+    echo "The default selection is gts, stable (weekly builds) and stable-daily (daily builds) are for enthusiasts, and latest is for testers"
     choose_target=$(Choose date "${CHANNELS[@]}" cancel)
     if [[ "$choose_target" != "date" && "$choose_target" != "cancel" ]]; then
         rebase_target="${base_image}:${choose_target}"