From: Henning Schild <henning.schild@siemens.com>
Date: Tue, 3 Sep 2019 13:43:45 +0000 (+0200)
Subject: oe-git-proxy: allow setting SOCAT from outside
X-Git-Tag: uninative-2.7~187
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ea2690e867ff11250d3dd143184432dd03909910;p=openembedded-core.git

oe-git-proxy: allow setting SOCAT from outside

This allows to write selftests where we can mock the real socat.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/oe-git-proxy b/scripts/oe-git-proxy
index bb2ed2a46e..8499a99a71 100755
--- a/scripts/oe-git-proxy
+++ b/scripts/oe-git-proxy
@@ -41,10 +41,12 @@ if [ $# -lt 2 -o "$1" = '--help' -o "$1" = '-h' ] ; then
 fi
 
 # Locate the netcat binary
-SOCAT=$(which socat 2>/dev/null)
-if [ $? -ne 0 ]; then
-	echo "ERROR: socat binary not in PATH" 1>&2
-	exit 1
+if [ -z "$SOCAT" ]; then
+	SOCAT=$(which socat 2>/dev/null)
+	if [ $? -ne 0 ]; then
+		echo "ERROR: socat binary not in PATH" 1>&2
+		exit 1
+	fi
 fi
 METHOD=""