diff --git a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/diagnost.js b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/diagnost.js index 41f4553..159db8e 100644 --- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/diagnost.js +++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/diagnost.js @@ -53,7 +53,6 @@ return baseclass.extend({ } else { wnd.appendLog('ERROR: Process finished with retcode = ' + rc); } - wnd.setStage(999); wnd.appendLog('========================================================='); }, diff --git a/zapret2/Makefile b/zapret2/Makefile index c0ca798..da409f4 100644 --- a/zapret2/Makefile +++ b/zapret2/Makefile @@ -81,7 +81,7 @@ endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/opt/zapret2 $(INSTALL_DIR) $(1)/opt/zapret2/$(MAKE_PATH) - $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2 $(1)/opt/zapret2/$(MAKE_PATH)/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2 $(1)/opt/zapret2/$(MAKE_PATH)/ $(INSTALL_DIR) $(1)/opt/zapret2/ip2net $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)/opt/zapret2/ip2net/ $(INSTALL_DIR) $(1)/opt/zapret2/mdig @@ -124,14 +124,7 @@ define Package/$(PKG_NAME)/install $(CP) ./custom.d/* $(1)/opt/zapret2/init.d/openwrt/custom.d/ $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_BIN) ./uci-def-cfg.sh $(1)/etc/uci-defaults/zapret2-uci-def-cfg.sh - $(INSTALL_BIN) ./uci-def-cfg.sh $(1)/opt/zapret2/uci-def-cfg.sh - $(INSTALL_BIN) ./comfunc.sh $(1)/opt/zapret2/comfunc.sh - $(INSTALL_BIN) ./def-cfg.sh $(1)/opt/zapret2/def-cfg.sh - $(INSTALL_BIN) ./renew-cfg.sh $(1)/opt/zapret2/renew-cfg.sh - $(INSTALL_BIN) ./restore-def-cfg.sh $(1)/opt/zapret2/restore-def-cfg.sh - $(INSTALL_BIN) ./sync_config.sh $(1)/opt/zapret2/sync_config.sh - $(INSTALL_BIN) ./script-exec.sh $(1)/opt/zapret2/script-exec.sh - $(INSTALL_BIN) ./update-pkg.sh $(1)/opt/zapret2/update-pkg.sh + $(CP) ./*.sh $(1)/opt/zapret2/ # Fix permisions chmod 644 $(1)/opt/zapret2/ipset/*.txt chmod 644 $(1)/opt/zapret2/ipset_def/*.txt