From 3b39b34f8360c7681835a3051280ef11b80ddc79 Mon Sep 17 00:00:00 2001 From: Martin Eckhardt Date: Wed, 21 Jun 2017 09:44:42 +0200 Subject: [PATCH] Special chars should not be substituted. --- Gemfile | 4 ++-- .../action/configure_env_proxy.rb | 16 ++++++++-------- lib/vagrant-proxyconf/config/env_proxy.rb | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 9698c62..68f87d6 100644 --- a/Gemfile +++ b/Gemfile @@ -2,11 +2,11 @@ source 'https://rubygems.org' gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', - ref: ENV.fetch('VAGRANT_VERSION', 'v1.7.2') + ref: ENV.fetch('VAGRANT_VERSION', 'v1.9.4') gem 'cane', '~> 2.6' gem 'coveralls', require: false -gem 'rake' +gem 'rake', '< 11.0' gem 'rspec', '~> 3.1' gem 'rspec-its', '~> 1.0' gem 'tailor', '~> 1.4' diff --git a/lib/vagrant-proxyconf/action/configure_env_proxy.rb b/lib/vagrant-proxyconf/action/configure_env_proxy.rb index 255e97e..4ed81ad 100644 --- a/lib/vagrant-proxyconf/action/configure_env_proxy.rb +++ b/lib/vagrant-proxyconf/action/configure_env_proxy.rb @@ -107,14 +107,14 @@ def environment_sed_script def environment_config <<-CONFIG.gsub(/^\s+/, '') - HTTP_PROXY=#{config.http || ''} - HTTPS_PROXY=#{config.https || ''} - FTP_PROXY=#{config.ftp || ''} - NO_PROXY=#{config.no_proxy || ''} - http_proxy=#{config.http || ''} - https_proxy=#{config.https || ''} - ftp_proxy=#{config.ftp || ''} - no_proxy=#{config.no_proxy || ''} + HTTP_PROXY='#{config.http}' + HTTPS_PROXY='#{config.https}' + FTP_PROXY='#{config.ftp}' + NO_PROXY='#{config.no_proxy}' + http_proxy='#{config.http}' + https_proxy='#{config.https}' + ftp_proxy='#{config.ftp}' + no_proxy='#{config.no_proxy}' CONFIG end end diff --git a/lib/vagrant-proxyconf/config/env_proxy.rb b/lib/vagrant-proxyconf/config/env_proxy.rb index 94fd5d6..2f9ef8c 100644 --- a/lib/vagrant-proxyconf/config/env_proxy.rb +++ b/lib/vagrant-proxyconf/config/env_proxy.rb @@ -46,7 +46,7 @@ def config_for(key, value) # still in v1.0.x. value = value.inspect if key.name == :no_proxy - [var.upcase, var.downcase].map { |v| "export #{v}=#{value}\n" }.join + [var.upcase, var.downcase].map { |v| "export #{v}='#{value}'\n" }.join end end