From 6ae59654a0bba1d5afeaad2f5d1f1ae203978a8e Mon Sep 17 00:00:00 2001 From: Eugene Mirotin Date: Fri, 19 May 2017 01:44:30 +0300 Subject: [PATCH] fix --- build/actions/ssh.js | 3 +-- doc/cli.markdown | 2 +- lib/actions/ssh.coffee | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build/actions/ssh.js b/build/actions/ssh.js index 4fe22bf9..ab295ef4 100644 --- a/build/actions/ssh.js +++ b/build/actions/ssh.js @@ -42,7 +42,6 @@ module.exports = { alias: 'v' }, { signature: 'noproxy', - parameter: 'noproxy', boolean: true, description: "don't use the proxy configuration for this connection. Only makes sense if you've configured proxy globally." } @@ -90,11 +89,11 @@ module.exports = { sshProxyCommand = ''; proxyConfig = global.PROXY_CONFIG; if (proxyConfig && !options.noproxy) { - proxyAuth = proxyConfig.proxyAuth; tunnelOptions = { proxy: proxyConfig.host + ":" + proxyConfig.port, dest: '%h:%p' }; + proxyAuth = proxyConfig.proxyAuth; if (proxyAuth) { i = proxyAuth.indexOf(':'); _.assign(tunnelOptions, { diff --git a/doc/cli.markdown b/doc/cli.markdown index d0dcad5d..94057e1b 100644 --- a/doc/cli.markdown +++ b/doc/cli.markdown @@ -786,7 +786,7 @@ ssh gateway port increase verbosity -#### --noproxy <noproxy> +#### --noproxy don't use the proxy configuration for this connection. Only makes sense if you've configured proxy globally. diff --git a/lib/actions/ssh.coffee b/lib/actions/ssh.coffee index 6d79d0ab..7f4264c6 100644 --- a/lib/actions/ssh.coffee +++ b/lib/actions/ssh.coffee @@ -50,7 +50,6 @@ module.exports = alias: 'v' , signature: 'noproxy' - parameter: 'noproxy' boolean: true description: "don't use the proxy configuration for this connection. Only makes sense if you've configured proxy globally." @@ -90,10 +89,10 @@ module.exports = proxyConfig = global.PROXY_CONFIG if proxyConfig and not options.noproxy - { proxyAuth } = proxyConfig tunnelOptions = proxy: "#{proxyConfig.host}:#{proxyConfig.port}" dest: '%h:%p' + { proxyAuth } = proxyConfig if proxyAuth i = proxyAuth.indexOf(':') _.assign tunnelOptions,