From c647eafadceabfad39510011e11c97c305d72dfb Mon Sep 17 00:00:00 2001 From: zion Date: Sun, 15 Mar 2026 15:21:19 +0800 Subject: [PATCH] fix(nix/greeter): skip invalid customThemeFile in preStart (#1997) * fix(nix/greeter): skip invalid customThemeFile in preStart Avoid attempting to copy a null/empty/missing customThemeFile path by validating the jq result and file existence before cp. Update distro/nix/greeter.nix Co-authored-by: Lucas <43530291+LuckShiba@users.noreply.github.com> * nix/greeter: update customTheme verification --------- Co-authored-by: Lucas <43530291+LuckShiba@users.noreply.github.com> Co-authored-by: LuckShiba --- distro/nix/greeter.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/distro/nix/greeter.nix b/distro/nix/greeter.nix index c01d6cc9..e70e11b2 100644 --- a/distro/nix/greeter.nix +++ b/distro/nix/greeter.nix @@ -180,7 +180,9 @@ in fi if [ -f settings.json ]; then - if cp "$(${jq} -r '.customThemeFile' settings.json)" custom-theme.json; then + theme_file="$(${jq} -r '.customThemeFile // empty' settings.json)" + if [ -f "$theme_file" ] && [ -r "$theme_file" ]; then + cp "$theme_file" custom-theme.json mv settings.json settings.orig.json ${jq} '.customThemeFile = "${cacheDir}/custom-theme.json"' settings.orig.json > settings.json fi