From 31cbf985d66db44fa85c1a5adcf12105caecd5ed Mon Sep 17 00:00:00 2001 From: Celestia Ludenberg Date: Tue, 23 Jun 2026 13:07:14 +0200 Subject: [PATCH] fix: launch calamares-next instead of calamares directly; fix lsb/os-release fallback in get_lsb_infos --- data/preferences.json | 2 +- src/antergos_welcome.py | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/data/preferences.json b/data/preferences.json index eae9f03..45448a0 100644 --- a/data/preferences.json +++ b/data/preferences.json @@ -4,7 +4,7 @@ "default_locale": "en", "desktop_path": "/usr/share/applications/antergos-welcome.desktop", "gnometour_path": "/usr/bin/gnome-tour", - "installer_path": "/usr/bin/calamares", + "installer_path": "/usr/bin/calamares-next", "live_path": "/run/miso/bootmnt/antergos-next", "locale_path": "/usr/share/locale", "logo_path": "/usr/share/icons/hicolor/64x64/apps/antergos-next.png", diff --git a/src/antergos_welcome.py b/src/antergos_welcome.py index ba31364..576ba42 100755 --- a/src/antergos_welcome.py +++ b/src/antergos_welcome.py @@ -438,7 +438,7 @@ class Hello(Gtk.Window): if name == "install": subprocess.Popen(["sudo", "-E", "cnchi"]) elif name == "calamares": - subprocess.Popen(["sudo", "-E", "calamares"]) + subprocess.Popen(["sudo", "-E", "calamares-next"]) elif name == "autostart": self.set_autostart(action.get_active()) elif name == "about": @@ -524,10 +524,24 @@ def get_lsb_infos(): continue var = var.replace("DISTRIB_","") lsb[var] = arg.strip('"') + if lsb.get("CODENAME") and lsb.get("RELEASE"): + return lsb["CODENAME"], lsb["RELEASE"] + except (OSError, KeyError) as error: + print(error) + + # Fall back to os-release + try: + with open("/usr/lib/os-release") as os_release: + for line in os_release: + if "=" in line: + var, arg = line.rstrip().split("=") + if not arg: + continue + lsb[var] = arg.strip('"') + return lsb.get("VERSION_CODENAME", "unknown"), lsb.get("VERSION_ID", "rolling") except (OSError, KeyError) as error: print(error) return 'not Antergos NeXT', '0.0' - return lsb.get("CODENAME", "unknown"), lsb.get("RELEASE", "0.0") def get_icon_image(icon_name, icon_size): icon_theme = Gtk.IconTheme.get_default()