i11th/ruantiblock_openwrt
1
0
Fork 0
mirror of https://github.com/gSpotx2f/ruantiblock_openwrt.git synced 2026-05-13 22:20:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scripts moved to /usr/share/ruantiblock.

Browse Source
This commit is contained in:
gSpot
2023-04-24 17:59:35 +03:00
parent 6750096925
commit 406a7c7c09
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruantiblock/Makefile
+5 -5
View File
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ruantiblock PKG_NAME:=ruantiblock
PKG_VERSION:=1.1 PKG_VERSION:=1.1
PKG_RELEASE:=0 PKG_RELEASE:=1
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt> PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@@ -42,10 +42,10 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/etc/ruantiblock $(INSTALL_DIR) $(1)/etc/ruantiblock
$(INSTALL_CONF) ./files/etc/ruantiblock/ruantiblock.conf $(1)/etc/ruantiblock/ruantiblock.conf $(INSTALL_CONF) ./files/etc/ruantiblock/ruantiblock.conf $(1)/etc/ruantiblock/ruantiblock.conf
$(INSTALL_CONF) ./files/etc/ruantiblock/fqdn_filter $(1)/etc/ruantiblock/fqdn_filter $(INSTALL_CONF) ./files/etc/ruantiblock/fqdn_filter $(1)/etc/ruantiblock/fqdn_filter
$(INSTALL_DIR) $(1)/etc/ruantiblock/scripts $(INSTALL_DIR) $(1)/usr/share/ruantiblock
$(INSTALL_DATA) ./files/etc/ruantiblock/scripts/config_script $(1)/etc/ruantiblock/scripts/config_script $(INSTALL_DATA) ./files/usr/share/ruantiblock/config_script $(1)/usr/share/ruantiblock/config_script
$(INSTALL_DATA) ./files/etc/ruantiblock/scripts/info_output $(1)/etc/ruantiblock/scripts/info_output $(INSTALL_DATA) ./files/usr/share/ruantiblock/info_output $(1)/usr/share/ruantiblock/info_output
$(INSTALL_DATA) ./files/etc/ruantiblock/scripts/nft_functions $(1)/etc/ruantiblock/scripts/nft_functions $(INSTALL_DATA) ./files/usr/share/ruantiblock/nft_functions $(1)/usr/share/ruantiblock/nft_functions
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) ./files/usr/bin/ruantiblock $(1)/usr/bin/ruantiblock $(INSTALL_BIN) ./files/usr/bin/ruantiblock $(1)/usr/bin/ruantiblock
endef endef
ruantiblock/files/usr/bin/ruantiblock
+1 -1
View File
@@ -15,6 +15,7 @@ export LANGUAGE="en"
CONFIG_DIR="/etc/${NAME}" CONFIG_DIR="/etc/${NAME}"
CONFIG_FILE="${CONFIG_DIR}/${NAME}.conf" CONFIG_FILE="${CONFIG_DIR}/${NAME}.conf"
SCRIPTS_DIR="/usr/share/${NAME}"
export DATA_DIR="${CONFIG_DIR}/var" export DATA_DIR="${CONFIG_DIR}/var"
export MODULES_DIR="/usr/libexec/${NAME}" export MODULES_DIR="/usr/libexec/${NAME}"
### Дополнительный конфиг dnsmasq с FQDN записями блэклиста ### Дополнительный конфиг dnsmasq с FQDN записями блэклиста
@@ -147,7 +148,6 @@ export RA_ENCODING=""
### External config ### External config
[ -f "$CONFIG_FILE" ] && . "$CONFIG_FILE" [ -f "$CONFIG_FILE" ] && . "$CONFIG_FILE"
SCRIPTS_DIR="${CONFIG_DIR}/scripts"
CONFIG_SCRIPT="${SCRIPTS_DIR}/config_script" CONFIG_SCRIPT="${SCRIPTS_DIR}/config_script"
START_SCRIPT="${SCRIPTS_DIR}/start_script" START_SCRIPT="${SCRIPTS_DIR}/start_script"
STOP_SCRIPT="${SCRIPTS_DIR}/stop_script" STOP_SCRIPT="${SCRIPTS_DIR}/stop_script"
ruantiblock/files/etc/ruantiblock/scripts/config_script → ruantiblock/files/usr/share/ruantiblock/config_script
View File
ruantiblock/files/etc/ruantiblock/scripts/info_output → ruantiblock/files/usr/share/ruantiblock/info_output
View File
ruantiblock/files/etc/ruantiblock/scripts/nft_functions → ruantiblock/files/usr/share/ruantiblock/nft_functions
View File