From ccdc8849d48961ec6d1839f26c28d71db1432ce0 Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Fri, 19 Dec 2025 19:29:17 -0600 Subject: [PATCH 1/7] feat: asahi linux support in migration script, clean up old scripts and files Signed-off-by: Owen-sz --- {public => archive}/36to37.sh | 0 {src/assets => archive}/39/laptop/dark.png | Bin {src/assets => archive}/39/laptop/light.png | Bin {src/assets => archive}/39/screenshots/flagship.png | Bin {src/assets => archive}/39/screenshots/gnome.png | Bin {src/assets => archive}/39/screenshots/kde.png | Bin {src/assets => archive}/39/screenshots/pantheon.png | Bin {src/assets => archive}/40/laptop/dark.png | Bin {src/assets => archive}/40/laptop/light.png | Bin {src/assets => archive}/40/screenshots/flagship.png | Bin {src/assets => archive}/40/screenshots/gnome.png | Bin {src/assets => archive}/40/screenshots/kde.png | Bin {src/assets => archive}/40/screenshots/xfce.png | Bin .../41/marketing/current_computer.png | Bin {src/assets => archive}/41/marketing/work.png | Bin .../41/screenshots/flagship-dark.webp | Bin .../assets => archive}/41/screenshots/flagship.webp | Bin .../41/screenshots/gnome-dark.webp | Bin {src/assets => archive}/41/screenshots/gnome.webp | Bin .../41/screenshots/plasma-dark.webp | Bin {src/assets => archive}/41/screenshots/plasma.webp | Bin .../41/screenshots/xfce-dark.webp | Bin {src/assets => archive}/41/screenshots/xfce.webp | Bin {public => archive}/migrate-risi.sh | 0 public/migrate.sh | 11 ++++++++--- 25 files changed, 8 insertions(+), 3 deletions(-) rename {public => archive}/36to37.sh (100%) rename {src/assets => archive}/39/laptop/dark.png (100%) rename {src/assets => archive}/39/laptop/light.png (100%) rename {src/assets => archive}/39/screenshots/flagship.png (100%) rename {src/assets => archive}/39/screenshots/gnome.png (100%) rename {src/assets => archive}/39/screenshots/kde.png (100%) rename {src/assets => archive}/39/screenshots/pantheon.png (100%) rename {src/assets => archive}/40/laptop/dark.png (100%) rename {src/assets => archive}/40/laptop/light.png (100%) rename {src/assets => archive}/40/screenshots/flagship.png (100%) rename {src/assets => archive}/40/screenshots/gnome.png (100%) rename {src/assets => archive}/40/screenshots/kde.png (100%) rename {src/assets => archive}/40/screenshots/xfce.png (100%) rename {src/assets => archive}/41/marketing/current_computer.png (100%) rename {src/assets => archive}/41/marketing/work.png (100%) rename {src/assets => archive}/41/screenshots/flagship-dark.webp (100%) rename {src/assets => archive}/41/screenshots/flagship.webp (100%) rename {src/assets => archive}/41/screenshots/gnome-dark.webp (100%) rename {src/assets => archive}/41/screenshots/gnome.webp (100%) rename {src/assets => archive}/41/screenshots/plasma-dark.webp (100%) rename {src/assets => archive}/41/screenshots/plasma.webp (100%) rename {src/assets => archive}/41/screenshots/xfce-dark.webp (100%) rename {src/assets => archive}/41/screenshots/xfce.webp (100%) rename {public => archive}/migrate-risi.sh (100%) diff --git a/public/36to37.sh b/archive/36to37.sh similarity index 100% rename from public/36to37.sh rename to archive/36to37.sh diff --git a/src/assets/39/laptop/dark.png b/archive/39/laptop/dark.png similarity index 100% rename from src/assets/39/laptop/dark.png rename to archive/39/laptop/dark.png diff --git a/src/assets/39/laptop/light.png b/archive/39/laptop/light.png similarity index 100% rename from src/assets/39/laptop/light.png rename to archive/39/laptop/light.png diff --git a/src/assets/39/screenshots/flagship.png b/archive/39/screenshots/flagship.png similarity index 100% rename from src/assets/39/screenshots/flagship.png rename to archive/39/screenshots/flagship.png diff --git a/src/assets/39/screenshots/gnome.png b/archive/39/screenshots/gnome.png similarity index 100% rename from src/assets/39/screenshots/gnome.png rename to archive/39/screenshots/gnome.png diff --git a/src/assets/39/screenshots/kde.png b/archive/39/screenshots/kde.png similarity index 100% rename from src/assets/39/screenshots/kde.png rename to archive/39/screenshots/kde.png diff --git a/src/assets/39/screenshots/pantheon.png b/archive/39/screenshots/pantheon.png similarity index 100% rename from src/assets/39/screenshots/pantheon.png rename to archive/39/screenshots/pantheon.png diff --git a/src/assets/40/laptop/dark.png b/archive/40/laptop/dark.png similarity index 100% rename from src/assets/40/laptop/dark.png rename to archive/40/laptop/dark.png diff --git a/src/assets/40/laptop/light.png b/archive/40/laptop/light.png similarity index 100% rename from src/assets/40/laptop/light.png rename to archive/40/laptop/light.png diff --git a/src/assets/40/screenshots/flagship.png b/archive/40/screenshots/flagship.png similarity index 100% rename from src/assets/40/screenshots/flagship.png rename to archive/40/screenshots/flagship.png diff --git a/src/assets/40/screenshots/gnome.png b/archive/40/screenshots/gnome.png similarity index 100% rename from src/assets/40/screenshots/gnome.png rename to archive/40/screenshots/gnome.png diff --git a/src/assets/40/screenshots/kde.png b/archive/40/screenshots/kde.png similarity index 100% rename from src/assets/40/screenshots/kde.png rename to archive/40/screenshots/kde.png diff --git a/src/assets/40/screenshots/xfce.png b/archive/40/screenshots/xfce.png similarity index 100% rename from src/assets/40/screenshots/xfce.png rename to archive/40/screenshots/xfce.png diff --git a/src/assets/41/marketing/current_computer.png b/archive/41/marketing/current_computer.png similarity index 100% rename from src/assets/41/marketing/current_computer.png rename to archive/41/marketing/current_computer.png diff --git a/src/assets/41/marketing/work.png b/archive/41/marketing/work.png similarity index 100% rename from src/assets/41/marketing/work.png rename to archive/41/marketing/work.png diff --git a/src/assets/41/screenshots/flagship-dark.webp b/archive/41/screenshots/flagship-dark.webp similarity index 100% rename from src/assets/41/screenshots/flagship-dark.webp rename to archive/41/screenshots/flagship-dark.webp diff --git a/src/assets/41/screenshots/flagship.webp b/archive/41/screenshots/flagship.webp similarity index 100% rename from src/assets/41/screenshots/flagship.webp rename to archive/41/screenshots/flagship.webp diff --git a/src/assets/41/screenshots/gnome-dark.webp b/archive/41/screenshots/gnome-dark.webp similarity index 100% rename from src/assets/41/screenshots/gnome-dark.webp rename to archive/41/screenshots/gnome-dark.webp diff --git a/src/assets/41/screenshots/gnome.webp b/archive/41/screenshots/gnome.webp similarity index 100% rename from src/assets/41/screenshots/gnome.webp rename to archive/41/screenshots/gnome.webp diff --git a/src/assets/41/screenshots/plasma-dark.webp b/archive/41/screenshots/plasma-dark.webp similarity index 100% rename from src/assets/41/screenshots/plasma-dark.webp rename to archive/41/screenshots/plasma-dark.webp diff --git a/src/assets/41/screenshots/plasma.webp b/archive/41/screenshots/plasma.webp similarity index 100% rename from src/assets/41/screenshots/plasma.webp rename to archive/41/screenshots/plasma.webp diff --git a/src/assets/41/screenshots/xfce-dark.webp b/archive/41/screenshots/xfce-dark.webp similarity index 100% rename from src/assets/41/screenshots/xfce-dark.webp rename to archive/41/screenshots/xfce-dark.webp diff --git a/src/assets/41/screenshots/xfce.webp b/archive/41/screenshots/xfce.webp similarity index 100% rename from src/assets/41/screenshots/xfce.webp rename to archive/41/screenshots/xfce.webp diff --git a/public/migrate-risi.sh b/archive/migrate-risi.sh similarity index 100% rename from public/migrate-risi.sh rename to archive/migrate-risi.sh diff --git a/public/migrate.sh b/public/migrate.sh index 81df155..b7570bc 100644 --- a/public/migrate.sh +++ b/public/migrate.sh @@ -3,9 +3,9 @@ # Fedora to Ultramarine Linux migration script # Lea's pro tip: Run this through shellcheck, it'll genuinely save so much time and effort -ver="0.1.4" -# Oldest repo we provide is um37 -MINIMUM_RELEASEVER=37 +ver="0.2.0" +# Oldest repo we provide is um41 +MINIMUM_RELEASEVER=41 set -euo pipefail trace() { @@ -26,9 +26,14 @@ os_variant=$(grep -E '^VARIANT_ID=' /etc/os-release | sed -e 's/VARIANT_ID=//g'; # If the os_id is fedora and os_version is greater than or equal to MINIMUM_RELEASEVER, then permit upgrade, otherwise error if [[ ${os_id} = "fedora" ]] && [[ ${os_version} -ge $MINIMUM_RELEASEVER ]]; then : # do nothing +elif [[ ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -ge $MINIMUM_RELEASEVER ]]; then + : # do nothing elif [[ ${os_id} = "fedora" ]] || [[ ${os_version} -lt $MINIMUM_RELEASEVER ]]; then echo "This script is only for Fedora $MINIMUM_RELEASEVER or newer." exit 1 +elif [[ ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -ge $MINIMUM_RELEASEVER ]]; then + echo "This script is only for Fedora $MINIMUM_RELEASEVER or newer." + exit 1 elif [[ ${os_id} = "ultramarine" ]]; then echo "You are already running Ultramarine Linux. Congratulations!" exit 1 From e29e96daff4924ffc7ec4a8217ac03415a16c809 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 14 Jun 2026 08:27:42 -0500 Subject: [PATCH 2/7] simplify asahi logic Co-authored-by: june <159748074+june-fish@users.noreply.github.com> --- public/migrate.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/public/migrate.sh b/public/migrate.sh index b7570bc..f329503 100644 --- a/public/migrate.sh +++ b/public/migrate.sh @@ -24,14 +24,9 @@ os_version=$(grep -E '^VERSION_ID=' /etc/os-release | sed -e 's/VERSION_ID=//g'; os_variant=$(grep -E '^VARIANT_ID=' /etc/os-release | sed -e 's/VARIANT_ID=//g'; true) # If the os_id is fedora and os_version is greater than or equal to MINIMUM_RELEASEVER, then permit upgrade, otherwise error -if [[ ${os_id} = "fedora" ]] && [[ ${os_version} -ge $MINIMUM_RELEASEVER ]]; then +if [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -ge $MINIMUM_RELEASEVER ]]; then : # do nothing -elif [[ ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -ge $MINIMUM_RELEASEVER ]]; then - : # do nothing -elif [[ ${os_id} = "fedora" ]] || [[ ${os_version} -lt $MINIMUM_RELEASEVER ]]; then - echo "This script is only for Fedora $MINIMUM_RELEASEVER or newer." - exit 1 -elif [[ ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -ge $MINIMUM_RELEASEVER ]]; then +elif [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] || [[ ${os_version} -lt $MINIMUM_RELEASEVER ]]; then echo "This script is only for Fedora $MINIMUM_RELEASEVER or newer." exit 1 elif [[ ${os_id} = "ultramarine" ]]; then From 549b666e48fa05fa0d7a8c81ec86d6a3a0030ff7 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 14 Jun 2026 08:33:05 -0500 Subject: [PATCH 3/7] revert comment --- public/migrate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/migrate.sh b/public/migrate.sh index dd153d4..a6c85cf 100644 --- a/public/migrate.sh +++ b/public/migrate.sh @@ -24,7 +24,7 @@ os_id=$(grep -E '^ID=' /etc/os-release | sed -e 's/ID=//g'; true) os_version=$(grep -E '^VERSION_ID=' /etc/os-release | sed -e 's/VERSION_ID=//g'; true) os_variant=$(grep -E '^VARIANT_ID=' /etc/os-release | sed -e 's/VARIANT_ID=//g'; true) -# If the os_id is fedora and os_version is greater than or equal to MINIMUM_RELEASEVER, then permit upgrade, otherwise error +# If the os_id is fedora and os_version is between MINIMUM_RELEASEVER and MAXIMUM_RELEASEVER, then permit upgrade, otherwise error if [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -ge $MINIMUM_RELEASEVER ]]; then : # do nothing elif [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] || [[ ${os_version} -lt $MINIMUM_RELEASEVER ]]; then From e5097690bb966276031e48bc57ba5cc0c16ea69c Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 14 Jun 2026 08:33:36 -0500 Subject: [PATCH 4/7] keep MAXIMUN_VERSION --- public/migrate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/migrate.sh b/public/migrate.sh index a6c85cf..8e2ec54 100644 --- a/public/migrate.sh +++ b/public/migrate.sh @@ -25,7 +25,7 @@ os_version=$(grep -E '^VERSION_ID=' /etc/os-release | sed -e 's/VERSION_ID=//g'; os_variant=$(grep -E '^VARIANT_ID=' /etc/os-release | sed -e 's/VARIANT_ID=//g'; true) # If the os_id is fedora and os_version is between MINIMUM_RELEASEVER and MAXIMUM_RELEASEVER, then permit upgrade, otherwise error -if [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -ge $MINIMUM_RELEASEVER ]]; then +if [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -le $MAXIMUM_RELEASEVER ]]; then : # do nothing elif [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] || [[ ${os_version} -lt $MINIMUM_RELEASEVER ]]; then echo "This script is only for Fedora $MINIMUM_RELEASEVER or newer." From e64ab347dcb9d9b0616ed230f1099c3289f69941 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 14 Jun 2026 08:35:05 -0500 Subject: [PATCH 5/7] use MAXIMUM_RELEASEVER --- public/migrate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/migrate.sh b/public/migrate.sh index 8e2ec54..3153608 100644 --- a/public/migrate.sh +++ b/public/migrate.sh @@ -28,7 +28,7 @@ os_variant=$(grep -E '^VARIANT_ID=' /etc/os-release | sed -e 's/VARIANT_ID=//g'; if [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -le $MAXIMUM_RELEASEVER ]]; then : # do nothing elif [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] || [[ ${os_version} -lt $MINIMUM_RELEASEVER ]]; then - echo "This script is only for Fedora $MINIMUM_RELEASEVER or newer." + echo "This script is only for Fedora $MINIMUM_RELEASEVER to $MAXIMUM_RELEASEVER." exit 1 elif [[ ${os_id} = "ultramarine" ]]; then echo "You are already running Ultramarine Linux. Congratulations!" From 2931b05b87d74332688f7bd0a08937b8d1c3d1ee Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 14 Jun 2026 08:36:00 -0500 Subject: [PATCH 6/7] fix --- public/migrate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/migrate.sh b/public/migrate.sh index 3153608..3727e15 100644 --- a/public/migrate.sh +++ b/public/migrate.sh @@ -27,7 +27,7 @@ os_variant=$(grep -E '^VARIANT_ID=' /etc/os-release | sed -e 's/VARIANT_ID=//g'; # If the os_id is fedora and os_version is between MINIMUM_RELEASEVER and MAXIMUM_RELEASEVER, then permit upgrade, otherwise error if [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -le $MAXIMUM_RELEASEVER ]]; then : # do nothing -elif [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] || [[ ${os_version} -lt $MINIMUM_RELEASEVER ]]; then +elif [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -le $MAXIMUM_RELEASEVER ]]; then echo "This script is only for Fedora $MINIMUM_RELEASEVER to $MAXIMUM_RELEASEVER." exit 1 elif [[ ${os_id} = "ultramarine" ]]; then From d3624e38702511b3e830fb0705d0e2126a769fb6 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 14 Jun 2026 08:37:01 -0500 Subject: [PATCH 7/7] dont need --- public/migrate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/migrate.sh b/public/migrate.sh index 3727e15..21f0e4d 100644 --- a/public/migrate.sh +++ b/public/migrate.sh @@ -27,7 +27,7 @@ os_variant=$(grep -E '^VARIANT_ID=' /etc/os-release | sed -e 's/VARIANT_ID=//g'; # If the os_id is fedora and os_version is between MINIMUM_RELEASEVER and MAXIMUM_RELEASEVER, then permit upgrade, otherwise error if [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -le $MAXIMUM_RELEASEVER ]]; then : # do nothing -elif [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]] && [[ ${os_version} -le $MAXIMUM_RELEASEVER ]]; then +elif [[ ${os_id} = "fedora" || ${os_id} = "fedora-asahi-remix" ]]; then echo "This script is only for Fedora $MINIMUM_RELEASEVER to $MAXIMUM_RELEASEVER." exit 1 elif [[ ${os_id} = "ultramarine" ]]; then