From 502abff2b51394d25c692cfc045d8651ded495e1 Mon Sep 17 00:00:00 2001
From: bolvan <k@vodka.home.kg>
Date: Wed, 22 May 2019 10:40:05 +0300
Subject: [PATCH] install_easy : fix compilation in nondefault location

---
 install_easy.sh | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/install_easy.sh b/install_easy.sh
index 045a464..ea35378 100755
--- a/install_easy.sh
+++ b/install_easy.sh
@@ -83,20 +83,29 @@ check_system()
 	echo system is based on $SYSTEM
 }
 
-call_install_bin()
+check_bins()
 {
-	"$EXEDIR/install_bin.sh" $1 || {
-		echo binaries compatible with your system not found
-		if exists make; then
-			echo trying to compile
-			make -C "$EXEDIR" || {
-				echo could not compile
-				exitp 8
-			}
-		else
+	echo \* checking executables
+
+	local arch=$(get_bin_arch)
+	if [ -n "$arch" ] ; then
+		echo found. architecture is : "\"$arch\""
+	elif exists make; then
+		echo trying to compile
+		make -C "$EXEDIR" || {
+			echo could not compile
 			exitp 8
-		fi
-	}
+		}
+		echo compiled
+	else
+		echo build tools not found
+		exitp 8
+	fi
+}
+
+call_install_bin()
+{
+	"$EXEDIR/install_bin.sh" $1
 }
 get_bin_arch()
 {
@@ -107,7 +116,10 @@ install_binaries()
 {
 	echo \* installing binaries
 
-	call_install_bin
+	call_install_bin || {
+		echo compatible binaries not found
+		exitp 8
+	}
 }
 
 find_str_in_list()
@@ -455,6 +467,7 @@ install_systemd()
 {
 	INIT_SCRIPT_SRC=$EXEDIR/init.d/sysv/zapret
 
+	check_bins
 	check_location copy_all
 	check_prerequisites_linux
 	service_stop_systemd
@@ -672,6 +685,7 @@ install_openwrt()
 	OPENWRT_FW_INCLUDE=/etc/firewall.zapret
 	OPENWRT_IFACE_HOOK=$EXEDIR/init.d/openwrt/90-zapret
 	
+	check_bins
 	check_location copy_minimal
 	select_ipv6
 	check_prerequisites_openwrt