From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 16 Nov 2021 12:11:45 +0000 (+0100)
Subject: luci-theme-bootstrap: don't overwrite theme selection upon install
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0cee46bc638cbb91f84c249766877acc2e2230ca;p=project%2Fluci.git

luci-theme-bootstrap: don't overwrite theme selection upon install

Revert to the previous uci-defaults behaviour of only setting the
selected theme to Bootstrap if the Bootstrap entry didn't exist yet
in the configuration.

Ref: https://forum.openwrt.org/t/luci-theme-behaviour-change/112047
Fixes: ed86f03a9f ("luci-theme-bootstrap: add explicit dark/light mode selection")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0bc09cc749439e233afdf9cd71c14f67090a3a07)
---

diff --git a/themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap b/themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap
index b66e5b2be3..f83d84702a 100755
--- a/themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap
+++ b/themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap
@@ -6,21 +6,21 @@ set_opt() {
 	local key=$1
 	local val=$2
 
-	if ! uci -q get "luci.themes.$key" 2>/dev/null; then
-		uci set "luci.themes.$key=$val"
+	if ! uci -q get "luci.$key" 2>/dev/null; then
+		uci set "luci.$key=$val"
 		changed=1
 	fi
 }
 
-set_opt Bootstrap /luci-static/bootstrap
-set_opt BootstrapDark /luci-static/bootstrap-dark
-set_opt BootstrapLight /luci-static/bootstrap-light
+set_opt themes.Bootstrap /luci-static/bootstrap
 
-if [ "$PKG_UPGRADE" != 1 ]; then
-	uci set luci.main.mediaurlbase=/luci-static/bootstrap
-	changed=1
+if [ "$PKG_UPGRADE" != 1 ] && [ $changed = 1 ]; then
+	set_opt main.mediaurlbase /luci-static/bootstrap
 fi
 
+set_opt themes.BootstrapDark /luci-static/bootstrap-dark
+set_opt themes.BootstrapLight /luci-static/bootstrap-light
+
 if [ $changed = 1 ]; then
 	uci commit luci
 fi