diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-01 23:53:24 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-02 12:25:19 +0000 |
| commit | 6fd4699d077736c54eb3aa31b62593cc5bd82fdc (patch) | |
| tree | 74b967716a2586b70bf167d9c7ae23b5e59ad785 /scripts | |
| parent | 64bd33d18826d26d909bba04701e4f643a65279a (diff) | |
| download | ast2050-yocto-poky-6fd4699d077736c54eb3aa31b62593cc5bd82fdc.zip ast2050-yocto-poky-6fd4699d077736c54eb3aa31b62593cc5bd82fdc.tar.gz | |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/oe-git-proxy-socks-command | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/scripts/oe-git-proxy-socks-command b/scripts/oe-git-proxy-socks-command index 39e0acb..8acffb5 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 $@ |
