diff --git a/autoinstall/2.x/autoinstall.sh b/autoinstall/2.x/autoinstall.sh index 94870e9..0534d03 100755 --- a/autoinstall/2.x/autoinstall.sh +++ b/autoinstall/2.x/autoinstall.sh @@ -10,7 +10,7 @@ LUCI_APP=1 HTTPS_DNS_PROXY=1 OWRT_VERSION="current" -RUAB_VERSION="2.1.4-r2" +RUAB_VERSION="2.1.4-r3" RUAB_MOD_LUA_VERSION="2.1.4-r1" RUAB_LUCI_APP_VERSION="2.1.4-r1" BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master" diff --git a/ruantiblock/Makefile b/ruantiblock/Makefile index 32f2ea9..d6bf160 100644 --- a/ruantiblock/Makefile +++ b/ruantiblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruantiblock PKG_VERSION:=2.1.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=gSpot include $(INCLUDE_DIR)/package.mk diff --git a/ruantiblock/files/etc/init.d/ruantiblock b/ruantiblock/files/etc/init.d/ruantiblock index ca27be5..ff0bc48 100755 --- a/ruantiblock/files/etc/init.d/ruantiblock +++ b/ruantiblock/files/etc/init.d/ruantiblock @@ -13,20 +13,20 @@ get_dnsmasq_confdir() { printf "${VAR_DIR}/dnsmasq.d" return 0 else - _first_instance_dir=`ubus call service list | jsonfilter -e "VAR=$.dnsmasq.instances.*.mount" | awk -v CUR_DIR="$_current_dir" ' + _first_instance_dir=$(ubus call service list | jsonfilter -e "VAR=$.dnsmasq.instances.*.mount" | awk -v CUR_DIR="$_current_dir" ' BEGIN { RS = " "; } { sub("VAR=", "", $0); - gsub(/[\047,\134,\073]/, "", $0); + gsub(/[\047,\073,\\]/, "", $0); if($0 ~ /^\/tmp\/dnsmasq\./ && !($0 in a)) { a[length(a)] = $0; }; } END { print (CUR_DIR in a) ? CUR_DIR : a[0]; - }'` + }') if [ -n "$_first_instance_dir" ]; then printf "$_first_instance_dir" return 0 @@ -40,7 +40,7 @@ start() { config_load $APP_NAME config_get _update_at_startup config update_at_startup config_get _dnsmasq_confdir_cur config dnsmasq_confdir "" - _dnsmasq_confdir=`get_dnsmasq_confdir "$_dnsmasq_confdir_cur"` + _dnsmasq_confdir=$(get_dnsmasq_confdir "$_dnsmasq_confdir_cur") if [ $? -eq 0 -a -n "$_dnsmasq_confdir" ]; then if [ "$_dnsmasq_confdir" != "$_dnsmasq_confdir_cur" ]; then uci set "${APP_NAME}.config.dnsmasq_confdir"="$_dnsmasq_confdir"