Merge pull request #932 from jvortmann/check_presence_socat_anywhere_…

…in_path_using_command_v

Use 'comand -v' to check presence of socat anywhere in path #869.

shared/build/proxy/proxy.go

@@ -17,7 +17,7 @@ set +e
 // this command string will check if the socat utility
 // exists, and if it does, will proxy connections to
 // 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
 // in the event that it isn't installed on the server

shared/build/proxy/proxy_test.go

@@ -12,7 +12,7 @@ func TestProxy(t *testing.T) {
 	p.Set("8080", "172.1.4.5")
 	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 {
 		t.Errorf("Invalid proxy got:\n%s\nwant:\n%s", string(b), expected)
 	}