]> code.ossystems Code Review - openembedded-core.git/commitdiff
scripts/oe-git-proxy-socks-command: Add fallback to use nc
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 1 Mar 2012 23:53:24 +0000 (23:53 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 2 Mar 2012 12:24:05 +0000 (12:24 +0000)
If our own proxy command isn't available for some reason and nc is available,
fall back to use it.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/oe-git-proxy-socks-command

index 39e0acb79869114a838fe39f51f3ddc489163254..8acffb5248d6d1c0e2d99abc4e47e4a1eedbeb27 100755 (executable)
@@ -8,10 +8,16 @@ if [ -z "$PROXYSOCKS" -a -e "$SCRIPTDIR/oe-git-proxy-socks.c" ]; then
 fi
 PROXYSOCKS=`which oe-git-proxy-socks 2> /dev/null`
 if [ ! -x "$PROXYSOCKS" ]; then
-       # If that fails, explain to the user
-       echo "Unable to find oe-git-proxy-socks. This is usually created with the command"
-       echo "'gcc scripts/oe-git-proxy-socks.c -o scripts/oe-git-proxy-socks' which we tried"
-       echo "but it doesn't seem to have worked. Please compile the binary manually."
-       exit 1
+       # If that fails, we can see if netcat (nc) is available
+       NETCAT=`which nc 2> /dev/null`
+       if [ ! -x "$NETCAT" ]; then
+               # If that fails, explain to the user
+               echo "Unable to find oe-git-proxy-socks. This is usually created with the command"
+               echo "'gcc scripts/oe-git-proxy-socks.c -o scripts/oe-git-proxy-socks' which we tried"
+               echo "but it doesn't seem to have worked. Please compile the binary manually."
+               echo "Alternativly, install nc (netcat) on this machine."
+               exit 1
+       fi
+       exec $NETCAT -x $GIT_PROXY_HOST:$GIT_PROXY_PORT "$@"
 fi
 oe-git-proxy-socks -S $GIT_PROXY_HOST:$GIT_PROXY_PORT $@