From 92aa115a1c73721b11137c2a2cc6870e448fb049 Mon Sep 17 00:00:00 2001 From: Celestia Ludenberg Date: Tue, 23 Jun 2026 01:19:31 +0200 Subject: [PATCH] fix: antergos-welcome preferences loading and stable API usage - data/preferences.json: fix paths for subdirectory layout - src/antergos_welcome.py: fallback to data/preferences.json; get_lsb_infos() uses .get("CODENAME", "unknown") to avoid KeyError; remove stale "rescue" label --- data/preferences.json | 6 +++--- src/antergos_welcome.py | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data/preferences.json b/data/preferences.json index 1f0d12a..eae9f03 100644 --- a/data/preferences.json +++ b/data/preferences.json @@ -1,6 +1,6 @@ { "autostart_path": "~/.config/autostart/antergos-welcome.desktop", - "data_path": "/usr/share/antergos-next/antergos-welcome", + "data_path": "/usr/share/antergos-next/antergos-welcome/data", "default_locale": "en", "desktop_path": "/usr/share/applications/antergos-welcome.desktop", "gnometour_path": "/usr/bin/gnome-tour", @@ -11,8 +11,8 @@ "plasmawelcome_path": "/usr/bin/plasma-welcome", "rescue_path": "", "save_path": "~/.config/antergos-welcome.json", - "style_path": "/usr/share/antergos-next/antergos-welcome/style.css", - "ui_path": "/usr/share/antergos-next/antergos-welcome/antergos-welcome.glade", + "style_path": "/usr/share/antergos-next/antergos-welcome/ui/style.css", + "ui_path": "/usr/share/antergos-next/antergos-welcome/ui/antergos-welcome.glade", "urls": { "development": "https://github.com/Antergos-NeXT", "donate": "", diff --git a/src/antergos_welcome.py b/src/antergos_welcome.py index e6b41e9..ba31364 100755 --- a/src/antergos_welcome.py +++ b/src/antergos_welcome.py @@ -146,8 +146,14 @@ class Hello(Gtk.Window): logging.debug(f"Using dev preferences: {self.preferences}") else: self.preferences = read_json(f"{_HELLO_PREF_FILE}") + if not self.preferences: + self.preferences = read_json(f"{_HELLO_DATA_DIR}/data/preferences.json") logging.debug(f"Using system preferences: {self.preferences}") + if not self.preferences: + logging.critical("Cannot find preferences.json — aborting") + sys.exit(1) + # Get saved infos self.usr_prefs = read_json(self.preferences["save_path"]) if not self.usr_prefs: @@ -521,7 +527,7 @@ def get_lsb_infos(): except (OSError, KeyError) as error: print(error) return 'not Antergos NeXT', '0.0' - return lsb["CODENAME"], lsb["RELEASE"] + return lsb.get("CODENAME", "unknown"), lsb.get("RELEASE", "0.0") def get_icon_image(icon_name, icon_size): icon_theme = Gtk.IconTheme.get_default()