update-10.08

luci-app-jd-dailybonus/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 老竭力
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

luci-app-store/Makefile

@@ -10,7 +10,7 @@ LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team
 LUCI_DEPENDS:=+curl
 LUCI_PKGARCH:=all
 PKG_VERSION:=0.1.0
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_MAINTAINER:=jjm2473 <jjm2473@gmail.com>
 
 LUCI_BUILD_DEPENDS:=app-store-ui/host

luci-app-store/luasrc/controller/store.lua

@@ -35,7 +35,9 @@ local function user_id()
     local id
     if data ~= nil then
         id = json_parse(data)
-    else
+    end
+    if id == nil then
+        fs.unlink("/etc/.app_store.id")
         id = {arch="",uid=""}
     end
 

luci-app-store/root/etc/init.d/istore

@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2016 OpenWrt.org
+
+START=45
+
+boot() {
+    [ -s /etc/.app_store.id ] && return 0
+
+    mkdir -p /tmp/is-inst/var/lock
+    ARCH=`opkg -f /dev/null --offline-root /tmp/is-inst print-architecture | grep -v 'arch all' | grep -v 'arch noarch' | cut -d ' ' -f2`
+    rm -rf /tmp/is-inst
+
+    for iface in eth0 br-lan; do
+        if [ -e /sys/class/net/$iface/address ]; then
+            HASH=`md5sum /sys/class/net/$iface/address | cut -d ' ' -f1`
+            break
+        fi
+    done
+
+    if [ -z "$HASH" ]; then
+        HASH=`dd if=/dev/urandom bs=512 count=1 2>/dev/null | md5sum | cut -d ' ' -f1`
+    fi
+
+    echo "{\"arch\":\"${ARCH}\", \"uid\":\"${HASH}\"}" > /etc/.app_store.id
+}

luci-app-store/root/etc/uci-defaults/luci-app-store

@@ -1,22 +1,5 @@
 #!/bin/sh
 
-[ -e /etc/.app_store.id ] && exit 0
-
-mkdir -p /tmp/is-inst/var/lock
-ARCH=`opkg -f /dev/null --offline-root /tmp/is-inst print-architecture | grep -v 'arch all' | grep -v 'arch noarch' | cut -d ' ' -f2`
-rm -rf /tmp/is-inst
-
-for iface in eth0 br-lan; do
-    if [ -e /sys/class/net/$iface/address ]; then
-        HASH=`md5sum /sys/class/net/$iface/address | cut -d ' ' -f1`
-        break
-    fi
-done
-
-if [ -z "$HASH" ]; then
-    HASH=`dd if=/dev/urandom bs=512 count=1 2>/dev/null | md5sum | cut -d ' ' -f1`
-fi
-
-echo "{\"arch\":\"${ARCH}\", \"uid\":\"${HASH}\"}" > /etc/.app_store.id
+/etc/init.d/istore boot
 
 rm -rf /tmp/luci-indexcache /tmp/luci-modulecache

luci-app-vssr/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 老竭力
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

luci-theme-argon/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 老竭力
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

my-autocore/Makefile

@@ -7,13 +7,13 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=autocore
+PKG_NAME:=my-autocore
 PKG_VERSION:=1
 PKG_RELEASE:=29
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/autocore-arm
+define Package/my-autocore-arm
   TITLE:=ARM auto core script.
   MAINTAINER:=CN_SZTL
   DEPENDS:=@(arm||aarch64) \
@@ -23,14 +23,14 @@ define Package/autocore-arm
   VARIANT:=arm
 endef
 
-define Package/autocore-x86
+define Package/my-autocore-x86
   TITLE:=x86/x64 auto core loadbalance script.
   MAINTAINER:=Lean / CN_SZTL
   DEPENDS:=@TARGET_x86 +bc +lm-sensors +ethtool
   VARIANT:=x86
 endef
 
-define Package/autocore-arm/description
+define Package/my-autocore-arm/description
   Display more details info about the devices in LuCI.
 endef
 
@@ -48,7 +48,7 @@ endef
 define Build/Compile
 endef
 
-define Package/autocore-arm/install
+define Package/my-autocore-arm/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(DL_DIR)/cpuinfo $(1)/sbin/cpuinfo
 	$(INSTALL_BIN) ./files/common/ethinfo $(1)/sbin/ethinfo
@@ -56,7 +56,7 @@ define Package/autocore-arm/install
 	$(INSTALL_DATA) ./files/common/29_eth.js $(1)/www/luci-static/resources/view/status/include/
 endef
 
-define Package/autocore-x86/install
+define Package/my-autocore-x86/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) ./files/x86/cpuinfo $(1)/sbin/cpuinfo
 	$(INSTALL_BIN) ./files/common/ethinfo $(1)/sbin/ethinfo
@@ -67,5 +67,5 @@ define Package/autocore-x86/install
 endef
 
 $(eval $(call Download,armcpuinfo))
-$(eval $(call BuildPackage,autocore-arm))
-$(eval $(call BuildPackage,autocore-x86))
+$(eval $(call BuildPackage,my-autocore-arm))
+$(eval $(call BuildPackage,my-autocore-x86))

my-default-settings/Makefile

@@ -7,29 +7,29 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=default-settings
+PKG_NAME:=my-default-settings
 PKG_VERSION:=1
 PKG_RELEASE:=10
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/default-settings
+define Package/$(PKG_NAME)
   SECTION:=luci
   CATEGORY:=LuCI
   TITLE:=Default Settings
   MAINTAINER:=Kiddin'
   PKGARCH:=all
-  DEPENDS:=+luci-base
+  DEPENDS:=+luci-base +bash
 endef
 
-define Package/default-settings/conffiles
+define Package/$(PKG_NAME)/conffiles
 /etc/config/base_config
 endef
 
 define Build/Compile
 endef
 
-define Package/default-settings/install
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DATA) ./files/uci.defaults $(1)/etc/uci-defaults/95-default-settings
 	$(INSTALL_DIR) $(1)/etc/config
@@ -47,5 +47,5 @@ define Package/default-settings/install
 
 endef
 
-$(eval $(call BuildPackage,default-settings))
+$(eval $(call BuildPackage,$(PKG_NAME)))
 

open-app-filter/files/oaf_rule

@@ -37,7 +37,6 @@ load_rule()
     do
 	class_name=`echo "$file" | awk -F/ '{print $4}'| awk -F. '{print $1}'`
 	config_get appid_list "appfilter" "${class_name}apps"
-	echo "appid_list=$appid_list"
 
 	if ! test -z "$appid_list";then
 	    for appid in $appid_list:
@@ -59,24 +58,24 @@ load_mac_list()
     json_add_int "op" 4
     json_add_object "data"
     json_add_array "mac_list"
-	config_get mac_list "user" "users"
-	echo "mac list=$mac_list"
-	for mac in $mac_list:
-	do
-		echo "mac=$mac"
-		json_add_string "" $mac
-	done
+    config_get mac_list "user" "users"
+    echo "mac list=$mac_list"
+    if [ x"$mac_list" != x"" ];then    
+        for mac in $mac_list:          
+        do                             
+            json_add_string "" $mac
+        done                           
+    fi  
     json_str=`json_dump`
     config_apply "$json_str"
-	echo "json str=$json_str"
     json_cleanup
 }
 
 reload_rule(){
-	config_load appfilter
-	clean_rule
-	load_rule
-	load_mac_list
+    config_load appfilter
+    clean_rule
+    load_rule
+    load_mac_list
 }