From b5e5f20a813bd0cc11f11a1c3ecabb3a3e18c974 Mon Sep 17 00:00:00 2001
From: gSpot <gspot.x2f@gmail.com>
Date: Wed, 20 Nov 2024 20:56:38 +0300
Subject: [PATCH] Minor changes

---
 autoinstall/2.x/autoinstall.sh                                | 4 ++--
 ruantiblock-mod-lua/Makefile                                  | 4 +---
 .../files/etc/uci-defaults/ruantiblock-mod-lua                | 1 -
 ruantiblock-mod-py/Makefile                                   | 4 +---
 ruantiblock-mod-py/files/etc/uci-defaults/ruantiblock-mod-py  | 1 -
 ruantiblock/Makefile                                          | 2 +-
 ruantiblock/files/etc/init.d/ruantiblock                      | 3 +--
 7 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 ruantiblock-mod-lua/files/etc/uci-defaults/ruantiblock-mod-lua
 delete mode 100644 ruantiblock-mod-py/files/etc/uci-defaults/ruantiblock-mod-py

diff --git a/autoinstall/2.x/autoinstall.sh b/autoinstall/2.x/autoinstall.sh
index 482d069..5ccde6b 100755
--- a/autoinstall/2.x/autoinstall.sh
+++ b/autoinstall/2.x/autoinstall.sh
@@ -10,8 +10,8 @@ LUCI_APP=1
 HTTPS_DNS_PROXY=1
 
 OWRT_VERSION="current"
-RUAB_VERSION="2.1.0-r1"
-RUAB_MOD_LUA_VERSION="2.1.0-r1"
+RUAB_VERSION="2.1.0-r2"
+RUAB_MOD_LUA_VERSION="2.1.0-r2"
 RUAB_LUCI_APP_VERSION="2.1.0-2"
 BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master"
 PKG_DIR="/tmp"
diff --git a/ruantiblock-mod-lua/Makefile b/ruantiblock-mod-lua/Makefile
index c1115fd..62bbd40 100644
--- a/ruantiblock-mod-lua/Makefile
+++ b/ruantiblock-mod-lua/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruantiblock-mod-lua
 PKG_VERSION:=2.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
 
 include $(INCLUDE_DIR)/package.mk
@@ -34,8 +34,6 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) ./files/usr/libexec/ruantiblock/ruab_parser.lua $(1)/usr/libexec/ruantiblock/ruab_parser.lua
 	$(INSTALL_DIR) $(1)/usr/lib/lua
 	$(INSTALL_DATA) ./files/usr/lib/lua/iptool.lua $(1)/usr/lib/lua/iptool.lua
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DATA) ./files/etc/uci-defaults/ruantiblock-mod-lua $(1)/etc/uci-defaults/ruantiblock-mod-lua
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/ruantiblock-mod-lua/files/etc/uci-defaults/ruantiblock-mod-lua b/ruantiblock-mod-lua/files/etc/uci-defaults/ruantiblock-mod-lua
deleted file mode 100644
index 252b0cf..0000000
--- a/ruantiblock-mod-lua/files/etc/uci-defaults/ruantiblock-mod-lua
+++ /dev/null
@@ -1 +0,0 @@
-uci set ruantiblock.config.bllist_module='/usr/libexec/ruantiblock/ruab_parser.lua'; uci commit ruantiblock
diff --git a/ruantiblock-mod-py/Makefile b/ruantiblock-mod-py/Makefile
index d5cb4c4..f5d444b 100644
--- a/ruantiblock-mod-py/Makefile
+++ b/ruantiblock-mod-py/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruantiblock-mod-py
 PKG_VERSION:=2.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
 
 include $(INCLUDE_DIR)/package.mk
@@ -32,8 +32,6 @@ endef
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/libexec/ruantiblock
 	$(INSTALL_BIN) ./files/usr/libexec/ruantiblock/ruab_parser.py $(1)/usr/libexec/ruantiblock/ruab_parser.py
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DATA) ./files/etc/uci-defaults/ruantiblock-mod-py $(1)/etc/uci-defaults/ruantiblock-mod-py
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/ruantiblock-mod-py/files/etc/uci-defaults/ruantiblock-mod-py b/ruantiblock-mod-py/files/etc/uci-defaults/ruantiblock-mod-py
deleted file mode 100644
index ab8f632..0000000
--- a/ruantiblock-mod-py/files/etc/uci-defaults/ruantiblock-mod-py
+++ /dev/null
@@ -1 +0,0 @@
-uci set ruantiblock.config.bllist_module='/usr/libexec/ruantiblock/ruab_parser.py'; uci commit ruantiblock
diff --git a/ruantiblock/Makefile b/ruantiblock/Makefile
index 249dd19..6f52565 100644
--- a/ruantiblock/Makefile
+++ b/ruantiblock/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruantiblock
 PKG_VERSION:=2.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/ruantiblock/files/etc/init.d/ruantiblock b/ruantiblock/files/etc/init.d/ruantiblock
index 4dbf66c..4cbe01a 100755
--- a/ruantiblock/files/etc/init.d/ruantiblock
+++ b/ruantiblock/files/etc/init.d/ruantiblock
@@ -7,8 +7,6 @@ APP_NAME="ruantiblock"
 APP_EXEC="/usr/bin/${APP_NAME}"
 DNSMASQ_VAR_DIR="/tmp"
 
-config_load $APP_NAME
-
 get_dnsmasq_cfg_dir() {
 	local _first_instance
 	if [ -d "${DNSMASQ_VAR_DIR}/dnsmasq.d" ]; then
@@ -26,6 +24,7 @@ get_dnsmasq_cfg_dir() {
 
 start() {
 	local _update_at_startup _dnsmasq_cfg_dir
+	config_load $APP_NAME
 	config_get _update_at_startup config update_at_startup
 	config_get _dnsmasq_cfg_dir config dnsmasq_cfg_dir ""
 	if [ -z "$_dnsmasq_cfg_dir" ]; then