luci-app-argon-config: sync upstream

luci-app-argon-config/Makefile

@@ -1,27 +1,19 @@
-#
-# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-argon-config
-LUCI_PKGARCH:=all
 PKG_VERSION:=0.9
-PKG_RELEASE:=20210309
+PKG_RELEASE:=20220424
 
-include $(INCLUDE_DIR)/package.mk
+PKG_MAINTAINER:=jerrykuku <jerrykuku@qq.com>
 
-define Package/luci-app-argon-config
- 	SECTION:=luci
-	CATEGORY:=LuCI
-	SUBMENU:=3. Applications
-	TITLE:=LuCI page for Argon Config
-	PKGARCH:=all
-	DEPENDS:=+luci-compat
+LUCI_TITLE:=LuCI page for Argon Config
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+luci-compat
+
+define Package/$(PKG_NAME)/conffiles
+/etc/config/argon
 endef
 
-$(eval $(call BuildPackage,luci-app-argon-config))
+include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature

luci-app-argon-config/luasrc/controller/argon-config.lua

@@ -1,7 +1,3 @@
---[[
-luci-app-argon-config
-]]--
-
 module("luci.controller.argon-config", package.seeall)
 
 function index()
@@ -9,5 +5,6 @@ function index()
 		return
 	end
 
-	entry({"admin", "system", "argon-config"}, form("argon-config"), _("Argon Config"), 90)
+	local page = entry({"admin", "system", "argon-config"}, form("argon-config"), _("Argon Config"), 90)
+	page.acl_depends = { "luci-app-argon-config" }
 end

luci-app-argon-config/luasrc/model/cbi/argon-config.lua

@@ -207,10 +207,4 @@ btnrm.write = function(self, section)
     return v
 end
 
-function IsIpkFile(name)
-    name = name or ''
-    local ext = string.lower(string.sub(name, -4, -1))
-    return ext == '.ipk'
-end
-
 return br, ful, form

luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json

@@ -1,6 +1,6 @@
 {
-    "luci-argon-config": {
-        "description": "Luci Argon theme config ",
+    "luci-app-argon-config": {
+        "description": "Grant UCI access for luci-app-argon-config",
         "read": {
             "uci": [ "argon" ]
         },
@@ -8,4 +8,4 @@
             "uci": [ "argon" ]
         }
     }
-}
+}