fix: weird quoting in ublue-motd and ublue-fastfetch fallbacks (#117)

ublue-os · Jan 15, 2025 · e500d73 · e500d73
1 parent 42759d5
commit e500d73
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/ublue/fastfetch/src/ublue-bling-fastfetch b/ublue/fastfetch/src/ublue-bling-fastfetch
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-THEME=$(dconf read /org/gnome/desktop/interface/accent-color 2>/dev/null || printf '%s' "\'$DEFAULT_THEME\'")
+THEME=$(dconf read /org/gnome/desktop/interface/accent-color 2>/dev/null || echo -e "$DEFAULT_THEME")
 # Dconf will fail if the accent-color has not been changed yet
 if [ "$THEME" == "" ] ; then
 	# Gsettings will not update if the system's schemas have not been configured properly
-	THEME=$(gsettings get org.gnome.desktop.interface accent-color 2>/dev/null || printf '%s' "\'$DEFAULT_THEME\'")
+	THEME=$(gsettings get org.gnome.desktop.interface accent-color 2>/dev/null || echo -e "$DEFAULT_THEME")
 fi
 THEME=${THEME//\'/}
 THEME=${FASTFETCH_FORCE_THEME:-$THEME}

diff --git a/ublue/fastfetch/ublue-fastfetch.spec b/ublue/fastfetch/ublue-fastfetch.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name:           ublue-fastfetch
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%{?dist}
 Summary:        Fastfetch configuration for Universal Blue systems
 

diff --git a/ublue/motd/src/ublue-motd b/ublue/motd/src/ublue-motd
@@ -54,12 +54,11 @@ KEY_WARN_FILE="/run/user-motd-sbkey-warn.md"
 [ -e $KEY_WARN_FILE ] && KEY_WARN="**WARNING**: $(cat $KEY_WARN_FILE)"
 KEY_WARN_ESCAPED=$(escape "$KEY_WARN")
 
-
-THEME=$(dconf read /org/gnome/desktop/interface/accent-color 2>/dev/null || printf '%s' "\'$DEFAULT_THEME\'")
+THEME=$(dconf read /org/gnome/desktop/interface/accent-color 2>/dev/null || echo -e "$DEFAULT_THEME")
 # Dconf will fail if the accent-color has not been changed yet
 if [ "$THEME" == "" ] ; then
 	# Gsettings will not update if the system's schemas have not been configured properly
-	THEME=$(gsettings get org.gnome.desktop.interface accent-color 2>/dev/null || printf '%s' "\'$DEFAULT_THEME\'")
+	THEME=$(gsettings get org.gnome.desktop.interface accent-color 2>/dev/null || echo -e "$DEFAULT_THEME")
 fi
 THEME=${THEME//\'/}
 THEME=${MOTD_FORCE_THEME:-$THEME}

diff --git a/ublue/motd/ublue-motd.spec b/ublue/motd/ublue-motd.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name:           ublue-motd
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        MOTD scripts for Universal Blue images