From 5fd071aadbcaa3b136a37fa2cbcb9799b0153e2a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 3 Jun 2019 16:49:10 +0200 Subject: [PATCH] themes: don't reset theme on package upgrades Fixes: #2743 Signed-off-by: Jo-Philipp Wich --- .../root/etc/uci-defaults/30_luci-theme-bootstrap | 14 +++++++++----- .../root/etc/uci-defaults/30_luci-theme-material | 14 +++++++++----- .../root/etc/uci-defaults/30_luci-theme-openwrt | 15 ++++++++++----- .../root/etc/uci-defaults/30_luci-theme-rosy | 14 +++++++++----- 4 files changed, 37 insertions(+), 20 deletions(-) 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 09299e092..b5161843f 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,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF - set luci.themes.Bootstrap=/luci-static/bootstrap - set luci.main.mediaurlbase=/luci-static/bootstrap - commit luci -EOF + +if [ "$PKG_UPGRADE" != 1 ]; then + uci batch <<-EOF + set luci.themes.Bootstrap=/luci-static/bootstrap + set luci.main.mediaurlbase=/luci-static/bootstrap + commit luci + EOF +fi + exit 0 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 b01337821..96ab46185 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,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF - set luci.themes.Material=/luci-static/material - set luci.main.mediaurlbase=/luci-static/material - commit luci -EOF + +if [ "$PKG_UPGRADE" != 1 ]; then + uci batch <<-EOF + set luci.themes.Material=/luci-static/material + set luci.main.mediaurlbase=/luci-static/material + commit luci + EOF +fi + exit 0 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 aa0ba0c23..77e2f6064 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,11 @@ #!/bin/sh -uci batch <<-EOF - set luci.themes.OpenWrt=/luci-static/openwrt.org - set luci.main.mediaurlbase=/luci-static/openwrt.org - commit luci -EOF + +if [ "$PKG_UPGRADE" != 1 ]; then + uci batch <<-EOF + set luci.themes.OpenWrt=/luci-static/openwrt.org + set luci.main.mediaurlbase=/luci-static/openwrt.org + commit luci + EOF +fi + +exit 0 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 2657a2977..ab0299a9c 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,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF - set luci.themes.Rosy=/luci-static/rosy - set luci.main.mediaurlbase=/luci-static/rosy - commit luci -EOF + +if [ "$PKG_UPGRADE" != 1 ]; then + uci batch <<-EOF + set luci.themes.Rosy=/luci-static/rosy + set luci.main.mediaurlbase=/luci-static/rosy + commit luci + EOF +fi + exit 0 -- 2.25.1