Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Jo-Philipp Wich 2021-11-16 13:11:45 +01:00
parent 8055acc9be
commit 0bc09cc749
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap
View file

@ -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