Fix COLOR_SCHEME when commands exit with error

Fix #57
linuxdeploy · Oct 4, 2023 · e2c0785 · e2c0785
1 parent 0a983ad
commit e2c0785
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/linuxdeploy-plugin-gtk.sh b/linuxdeploy-plugin-gtk.sh
@@ -226,9 +226,9 @@ mkdir -p "$HOOKSDIR"
 cat > "$HOOKFILE" <<\EOF
 #! /usr/bin/env bash
 
-COLOR_SCHEME="$(dbus-send --session --dest=org.freedesktop.portal.Desktop --type=method_call --print-reply --reply-timeout=1000 /org/freedesktop/portal/desktop org.freedesktop.portal.Settings.Read 'string:org.freedesktop.appearance' 'string:color-scheme' 2>/dev/null | tail -n1 | cut -b35- | cut -d' ' -f2)"
+COLOR_SCHEME="$(dbus-send --session --dest=org.freedesktop.portal.Desktop --type=method_call --print-reply --reply-timeout=1000 /org/freedesktop/portal/desktop org.freedesktop.portal.Settings.Read 'string:org.freedesktop.appearance' 'string:color-scheme' 2> /dev/null | tail -n1 | cut -b35- | cut -d' ' -f2 || echo -n)"
 if [ -z "$COLOR_SCHEME" ]; then
-    COLOR_SCHEME="$(gsettings get org.gnome.desktop.interface color-scheme 2> /dev/null)"
+    COLOR_SCHEME="$(gsettings get org.gnome.desktop.interface color-scheme 2> /dev/null || echo -n)"
 fi
 case "$COLOR_SCHEME" in
     "1"|"'prefer-dark'")  GTK_THEME_VARIANT="dark";;