From fc150636b9393e31aa7d5a8d8320b111476ba2f1 Mon Sep 17 00:00:00 2001 From: Chen Minqiang Date: Fri, 3 Apr 2020 18:10:04 +0800 Subject: [PATCH] luci-theme-*: set mediaurlbase if it is the first time to be installed If we build multi-themes into firmware, each of them set itself to be the default theme, what theme should it be? To make it clear, we only set mediaurlbase if the theme is the first time to be installed/built-in. This resolve the issue that theme always change to somewhat default after upgrading the firmware even with a config-keep-upgrade Signed-off-by: Chen Minqiang --- .../root/etc/uci-defaults/30_luci-theme-bootstrap | 1 + .../root/etc/uci-defaults/30_luci-theme-material | 1 + .../root/etc/uci-defaults/30_luci-theme-openwrt-2020 | 1 + .../root/etc/uci-defaults/30_luci-theme-openwrt | 1 + themes/luci-theme-rosy/root/etc/uci-defaults/30_luci-theme-rosy | 1 + 5 files changed, 5 insertions(+) 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 b5161843fe..4381a15c2e 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 @@ -1,6 +1,7 @@ #!/bin/sh if [ "$PKG_UPGRADE" != 1 ]; then + uci get luci.themes.Bootstrap >/dev/null 2>&1 || \ uci batch <<-EOF set luci.themes.Bootstrap=/luci-static/bootstrap set luci.main.mediaurlbase=/luci-static/bootstrap diff --git a/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material b/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material index 96ab461859..7f07239ec0 100755 --- a/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material +++ b/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material @@ -1,6 +1,7 @@ #!/bin/sh if [ "$PKG_UPGRADE" != 1 ]; then + uci get luci.themes.Material >/dev/null 2>&1 || \ uci batch <<-EOF set luci.themes.Material=/luci-static/material set luci.main.mediaurlbase=/luci-static/material diff --git a/themes/luci-theme-openwrt-2020/root/etc/uci-defaults/30_luci-theme-openwrt-2020 b/themes/luci-theme-openwrt-2020/root/etc/uci-defaults/30_luci-theme-openwrt-2020 index 45e742ad73..7c49acfda9 100755 --- a/themes/luci-theme-openwrt-2020/root/etc/uci-defaults/30_luci-theme-openwrt-2020 +++ b/themes/luci-theme-openwrt-2020/root/etc/uci-defaults/30_luci-theme-openwrt-2020 @@ -1,6 +1,7 @@ #!/bin/sh if [ "$PKG_UPGRADE" != 1 ]; then + uci get luci.themes.OpenWrt2020 >/dev/null 2>&1 || \ uci batch <<-EOF set luci.themes.OpenWrt2020=/luci-static/openwrt2020 set luci.main.mediaurlbase=/luci-static/openwrt2020 diff --git a/themes/luci-theme-openwrt/root/etc/uci-defaults/30_luci-theme-openwrt b/themes/luci-theme-openwrt/root/etc/uci-defaults/30_luci-theme-openwrt index 77e2f6064b..7ee8c193d7 100755 --- a/themes/luci-theme-openwrt/root/etc/uci-defaults/30_luci-theme-openwrt +++ b/themes/luci-theme-openwrt/root/etc/uci-defaults/30_luci-theme-openwrt @@ -1,6 +1,7 @@ #!/bin/sh if [ "$PKG_UPGRADE" != 1 ]; then + uci get luci.themes.OpenWrt >/dev/null 2>&1 || \ uci batch <<-EOF set luci.themes.OpenWrt=/luci-static/openwrt.org set luci.main.mediaurlbase=/luci-static/openwrt.org diff --git a/themes/luci-theme-rosy/root/etc/uci-defaults/30_luci-theme-rosy b/themes/luci-theme-rosy/root/etc/uci-defaults/30_luci-theme-rosy index ab0299a9c3..8c21ddddd6 100755 --- a/themes/luci-theme-rosy/root/etc/uci-defaults/30_luci-theme-rosy +++ b/themes/luci-theme-rosy/root/etc/uci-defaults/30_luci-theme-rosy @@ -1,6 +1,7 @@ #!/bin/sh if [ "$PKG_UPGRADE" != 1 ]; then + uci get luci.themes.Rosy >/dev/null 2>&1 || \ uci batch <<-EOF set luci.themes.Rosy=/luci-static/rosy set luci.main.mediaurlbase=/luci-static/rosy -- 2.30.2