From e3000ce8c713c6f80ce1a2b990dfdf9252cc11c2 Mon Sep 17 00:00:00 2001
From: rickpeters <rickpeters@upriser.nl>
Date: Mon, 28 Sep 2026 19:14:17 +0200
Subject: [PATCH] fix: Only the installer says Steamify (CachyOS with Steamify
 Installer); the live session keeps CachyOS's own name

---
 TODO.md                                       | 22 +++++++------------
 archiso/airootfs/etc/os-release               |  4 ++--
 .../usr/local/bin/calamares-online.sh         |  2 +-
 steamify-customize.sh                         |  6 ++---
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/TODO.md b/TODO.md
index 4a09455..d142d57 100644
--- a/TODO.md
+++ b/TODO.md
@@ -17,17 +17,12 @@
        packageOperations markers) into one `steamifyChoice` GS key, so
        `shellprocess_steamify.conf` doesn't need to know which page ran.
 
-2. **Titles**: the installer is "CachyOS - Steamify Installer" (productName,
-   set by calamares-online.sh after its reinstall; check after the next
-   build). Hello's window title "CachyOS Hello" is compiled into
-   `/usr/bin/cachyos-hello`: "CachyOS - Steamify Hello" needs Hello rebuilt
-   with a patch (like packagechooserq), or only its launcher entry renamed.
-   The Gaming mode / Desktop radio buttons stay (the user likes them).
-3. **Check the live name** (the build tree has it right:
-   `build/x86_64/airootfs/etc/os-release`) after the next build: Hello's subtitle should say
-   "Steamify CachyOS, based on CachyOS rolling" (`steamify-customize.sh`,
-   run by mkarchiso after the packages; the airootfs copy of os-release is
-   overwritten by a package).
+2. **Names**: only the installer says Steamify ("CachyOS with Steamify
+   Installer", productName set by calamares-online.sh); the live session,
+   Hello and About this System keep CachyOS's own names (legal clarity). The
+   ISO file stays `steamify-cachyos-<date>.iso`.
+3. **Check the names** after the next build: installer title, Hello and
+   About this System say CachyOS.
 4. ~~Steamify PR for `feat/defaults-options`~~ — done: 2.7.0 (`--options`,
    `--boot`, `steamify.sh --boot` standalone) and 2.8.0
    (`--defaults --list`, what the Steamify page's rows come from) are both
@@ -84,9 +79,8 @@
 
 ## Later
 
-- **Branding**: the live session's os-release says "Steamify, based on
-  CachyOS" (Hello's subtitle); Hello's window title and the boot menu still
-  say CachyOS. Check with the CachyOS team.
+- **Branding**: only the installer carries Steamify's name; check with the
+  CachyOS team whether that and the ISO file name are fine with them.
 - **Release**: a CI job that builds the ISO (privileged container, flags from
   the steam-machine-iso skill) and hosts it (>2 GB, not a GitHub release asset).
 - **Drop the Boost 1.91 workaround** in `steamify-prepare.sh` once
diff --git a/archiso/airootfs/etc/os-release b/archiso/airootfs/etc/os-release
index cd63f1c..b7f9e09 100644
--- a/archiso/airootfs/etc/os-release
+++ b/archiso/airootfs/etc/os-release
@@ -1,5 +1,5 @@
-NAME="Steamify CachyOS, based on CachyOS"
-PRETTY_NAME="Steamify CachyOS, based on CachyOS"
+NAME="CachyOS"
+PRETTY_NAME="CachyOS"
 ID=arch
 BUILD_ID=rolling
 ANSI_COLOR="38;2;23;147;209"
diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh
index d653c34..5c6ba60 100755
--- a/archiso/airootfs/usr/local/bin/calamares-online.sh
+++ b/archiso/airootfs/usr/local/bin/calamares-online.sh
@@ -35,7 +35,7 @@ main() {
     sudo pacman -Sy --noconfirm cachyos-calamares-next
     # The installer's window title ("%1 Installer") and welcome text use the
     # branding's productName; the reinstall above restored CachyOS's.
-    sudo sed -i 's/^\(    productName: *\)CachyOS$/\1CachyOS - Steamify/' \
+    sudo sed -i 's/^\(    productName: *\)CachyOS$/\1CachyOS with Steamify/' \
         /usr/share/calamares/branding/cachyos/branding.desc
 
     # Get Hardware Informations
diff --git a/steamify-customize.sh b/steamify-customize.sh
index 07a6f30..309222d 100755
--- a/steamify-customize.sh
+++ b/steamify-customize.sh
@@ -5,6 +5,6 @@
 # overwrite them.
 set -euo pipefail
 root="$1"
-# The name CachyOS Hello shows ("Steamify CachyOS, based on CachyOS rolling").
-sed -i -e 's/^NAME=.*/NAME="Steamify CachyOS, based on CachyOS"/' \
-    -e 's/^PRETTY_NAME=.*/PRETTY_NAME="Steamify CachyOS, based on CachyOS"/' "$root/etc/os-release"
+# Nothing yet: the live session keeps CachyOS's own name (only the installer
+# says "CachyOS with Steamify", see calamares-online.sh).
+exit 0