From ced6223496c752236c079bc2f9b4992195b74d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E7=AB=AD=E5=8A=9B?= Date: Mon, 7 Sep 2020 22:18:57 +0800 Subject: [PATCH] Revert "Set the theme as the default theme(branch: master)" --- Makefile | 11 +++-------- files/30_luci-theme-atmaterial | 7 ------- 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 files/30_luci-theme-atmaterial diff --git a/Makefile b/Makefile index 13d70be..c8833c4 100644 --- a/Makefile +++ b/Makefile @@ -8,16 +8,11 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argon Theme LUCI_DEPENDS:= -PKG_VERSION:=2.2.5 -PKG_RELEASE:=20200907 +PKG_VERSION:=2.2.4 +PKG_RELEASE:=20200821 include $(TOPDIR)/feeds/luci/luci.mk -define Package/luci-theme-argon/install - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) ./files/30_luci-theme-argon $(1)/etc/uci-defaults/luci-theme-argon -endef - define Package/luci-theme-argon/postinst #!/bin/sh sed -i ":a;$!N;s/tmpl.render.*sysauth_template.*return/local scope = { duser = default_user, fuser = user }\nlocal ok, res = luci.util.copcall\(luci.template.render_string, [[<% include\(\"themes\/\" .. theme .. \"\/sysauth\"\) %>]], scope\)\nif ok then\nreturn res\nend\nreturn luci.template.render\(\"sysauth\", scope\)/;ba" /usr/lib/lua/luci/dispatcher.lua @@ -27,4 +22,4 @@ rm -Rf /var/luci-indexcache exit 0 endef -# call BuildPackage - OpenWrt buildroot signature +# call BuildPackage - OpenWrt buildroot signature \ No newline at end of file diff --git a/files/30_luci-theme-atmaterial b/files/30_luci-theme-atmaterial deleted file mode 100644 index 401fbaa..0000000 --- a/files/30_luci-theme-atmaterial +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -uci batch <<-EOF - set luci.themes.Argon=/luci-static/argon - set luci.main.mediaurlbase=/luci-static/argon - commit luci -EOF -exit 0