diff --git a/.gitignore b/.gitignore index 9934d32823..f344e82237 100644 --- a/.gitignore +++ b/.gitignore @@ -70,7 +70,7 @@ share/esx-fw-vnc/*.rpm share/esx-fw-vnc/.vagrant* *.vscode - +*.code-workspace share/context/* !share/context/download_context.sh !share/context/SConstruct diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb index 4421ddb1b2..eab1ea960f 100755 --- a/src/market_mad/one_market.rb +++ b/src/market_mad/one_market.rb @@ -317,7 +317,7 @@ opts = GetoptLong.new( [ '--threads', '-t', GetoptLong::OPTIONAL_ARGUMENT ], [ '--market-types', '-m', GetoptLong::OPTIONAL_ARGUMENT ], [ '--timeout', '-w', GetoptLong::OPTIONAL_ARGUMENT ], - [ '--proxy' , GetoptLong::OPTIONAL_ARGUMENT ] + [ '--proxy' '-p', GetoptLong::OPTIONAL_ARGUMENT ] ) mp_type = nil @@ -333,6 +333,8 @@ begin mp_type = arg.split(',').map {|a| a.strip } when '--timeout' timeout = arg.to_i + when '--proxy' + ENV['http_proxy'] = arg end end rescue Exception => e