Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2025-12-14 15:36:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

install: Check syntax of main config on install and uninstall

Browse Source
This commit is contained in:
remittor
2024-11-12 22:38:45 +03:00
parent 4811af79da
commit e6c901a06a
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
zapret/Makefile
View File

@@ -150,6 +150,13 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
rm -f /etc/uci-defaults/zapret-uci-def-cfg.sh rm -f /etc/uci-defaults/zapret-uci-def-cfg.sh
# copy (sync) all params from uci-config to main config # copy (sync) all params from uci-config to main config
/opt/zapret/sync_config.sh /opt/zapret/sync_config.sh
# check main config
sh -n "$$ZAPRET_CONFIG"
ZAPRET_CONFIG_ERRCODE=$$?
[ "$$ZAPRET_CONFIG_ERRCODE" != "0" ] && cp -f "$$ZAPRET_CONFIG_DEF" "$$ZAPRET_CONFIG"
sh -n "$$ZAPRET_CONFIG"
ZAPRET_CONFIG_ERRCODE=$$?
[ "$$ZAPRET_CONFIG_ERRCODE" != "0" ] && exit 58
# enable main service # enable main service
/etc/init.d/zapret enable /etc/init.d/zapret enable
# stop all # stop all
@@ -171,7 +178,18 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
EXEDIR=/opt/zapret EXEDIR=/opt/zapret
ZAPRET_BASE=/opt/zapret ZAPRET_BASE=/opt/zapret
ZAPRET_CONFIG=/opt/zapret/config ZAPRET_CONFIG=/opt/zapret/config
ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
OPENWRT_FW_INCLUDE=/etc/firewall.zapret OPENWRT_FW_INCLUDE=/etc/firewall.zapret
# check main config
sh -n "$$ZAPRET_CONFIG"
ZAPRET_CONFIG_ERRCODE=$$?
[ "$$ZAPRET_CONFIG_ERRCODE" != "0" ] && cp -f "$$ZAPRET_CONFIG_DEF" "$$ZAPRET_CONFIG"
sh -n "$$ZAPRET_CONFIG"
ZAPRET_CONFIG_ERRCODE=$$?
if [ "$$ZAPRET_CONFIG_ERRCODE" != "0" ]; then
ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
exit 0
fi
. "$${ZAPRET_CONFIG}" . "$${ZAPRET_CONFIG}"
. "$${ZAPRET_BASE}/common/base.sh" . "$${ZAPRET_BASE}/common/base.sh"
. "$${ZAPRET_BASE}/common/fwtype.sh" . "$${ZAPRET_BASE}/common/fwtype.sh"