darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use command -v to check socat anywhere in path #869.

Browse source
This commit is contained in:
Joao Vortmann 2015-03-22 09:30:01 -03:00
parent ea3ea059e0
commit 0e3b499996
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shared/build/proxy/proxy.go
View file

@ -17,7 +17,7 @@ set +e
// this command string will check if the socat utility // this command string will check if the socat utility
// exists, and if it does, will proxy connections to // exists, and if it does, will proxy connections to
// the external IP address. // the external IP address.
const command = "[ -x /usr/bin/socat ] && socat TCP-LISTEN:%s,fork TCP:%s:%s &\n" const command = "command -v socat >/dev/null && socat TCP-LISTEN:%s,fork TCP:%s:%s &\n"
// alternative command that acts as a "polyfill" for socat // alternative command that acts as a "polyfill" for socat
// in the event that it isn't installed on the server // in the event that it isn't installed on the server

2
shared/build/proxy/proxy_test.go
View file

@ -12,7 +12,7 @@ func TestProxy(t *testing.T) {
p.Set("8080", "172.1.4.5") p.Set("8080", "172.1.4.5")
b := p.Bytes() b := p.Bytes()
expected := header + "[ -x /usr/bin/socat ] && socat TCP-LISTEN:8080,fork TCP:172.1.4.5:8080 &\n" expected := header + "command -v socat >/dev/null && socat TCP-LISTEN:8080,fork TCP:172.1.4.5:8080 &\n"
if string(b) != expected { if string(b) != expected {
t.Errorf("Invalid proxy got:\n%s\nwant:\n%s", string(b), expected) t.Errorf("Invalid proxy got:\n%s\nwant:\n%s", string(b), expected)
} }