Merge pull request #127 from jerrykuku/revert-124-master

Revert "Set the theme as the default theme(branch: master)"
This commit is contained in:
老竭力 2020-09-07 22:26:23 +08:00 committed by GitHub
commit 3d1e6946b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 15 deletions

View File

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

View File

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