From 6fd4699d077736c54eb3aa31b62593cc5bd82fdc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 1 Mar 2012 23:53:24 +0000 Subject: scripts/oe-git-proxy-socks-command: Add fallback to use nc If our own proxy command isn't available for some reason and nc is available, fall back to use it. (From OE-Core rev: aaab6ae94258277dcd2f29823a64689e6245fa7a) Signed-off-by: Richard Purdie --- scripts/oe-git-proxy-socks-command | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/oe-git-proxy-socks-command b/scripts/oe-git-proxy-socks-command index 39e0acb798..8acffb5248 100755 --- a/scripts/oe-git-proxy-socks-command +++ b/scripts/oe-git-proxy-socks-command @@ -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 $@ -- cgit v1.2.3-54-g00ecf