vpnbypass: fixed makefile and removed screenshot from .files/

Signed-off-by: Stan Grishin <redacted>

diff --git a/net/vpnbypass/Makefile b/net/vpnbypass/Makefile
index 8b3eee0a98007c9306ee9d5fa98632129dcc064d..2ac4f3f47dc1f2c461b7243357753be20e5770e6 100644 (file)
--- a/net/vpnbypass/Makefile
+++ b/net/vpnbypass/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vpnbypass
 PKG_VERSION:=1.1.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
 
@@ -32,6 +32,9 @@ define Package/$(PKG_NAME)/conffiles
 endef
 
 define Build/Prepare
+       mkdir -p $(PKG_BUILD_DIR)/files/
+       $(CP) ./files/vpnbypass.init $(PKG_BUILD_DIR)/files/vpnbypass.init
+       sed -i "s|^\(PKG_VERSION\).*|\1='$(PKG_VERSION)-$(PKG_RELEASE)'|" $(PKG_BUILD_DIR)/files/vpnbypass.init
 endef
 
 define Build/Configure
@@ -42,7 +45,7 @@ endef
 
 define Package/$(PKG_NAME)/install
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/vpnbypass.init $(1)/etc/init.d/vpnbypass
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/vpnbypass.init $(1)/etc/init.d/vpnbypass
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_CONF) ./files/vpnbypass.conf $(1)/etc/config/vpnbypass
        $(INSTALL_DIR) $(1)/etc/hotplug.d/firewall

diff --git a/net/vpnbypass/files/README.md b/net/vpnbypass/files/README.md
index 87e6fe234c85d06ec243f6b97ac590c4ad96ac16..7867ba76d514ad44876d277f18c45443861a0326 100644 (file)
--- a/net/vpnbypass/files/README.md
+++ b/net/vpnbypass/files/README.md
@@ -11,7 +11,7 @@ A simple PROCD-based vpnbypass service for OpenWrt/LEDE Project. Useful if your
 - Proudly made in Canada, using locally-sourced electrons.
 
 ## Screenshot (luci-app-vpnbypass)
-![screenshot](screenshot.png "screenshot")
+![screenshot](https://raw.githubusercontent.com/stangri/screenshots/master/vpnbypass/screenshot01.png "screenshot")
 
 ## Requirements
 This service requires following packages to be installed on your router: ```ip-full ipset iptables dnsmasq-full``` (```ip-full``` requires you uninstall ```ip``` first; ```dnsmasq-full``` requires you uninstall ```dnsmasq``` first). Run the following commands to satisfy the requirements:

diff --git a/net/vpnbypass/files/screenshot.png b/net/vpnbypass/files/screenshot.png
deleted file mode 100644 (file)
index 02cf696..0000000
Binary files a/net/vpnbypass/files/screenshot.png and /dev/null differ