From ccdc8849d48961ec6d1839f26c28d71db1432ce0 Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Fri, 19 Dec 2025 19:29:17 -0600 Subject: [PATCH] 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