haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8196 from chrisroberts/fix/expand-vagrantfile-path 

Allow VAGRANT_DOTFILE_PATH to be expanded as expected.
This commit is contained in:
Chris Roberts 2017-02-23 13:33:07 -08:00 committed by GitHub
parent 8530250f4a 832c62f2aa
commit 74438cc495
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vagrant/environment.rb
View File

@ -160,8 +160,8 @@ module Vagrant
# it is expanded relative to the root path. Otherwise, we use the # it is expanded relative to the root path. Otherwise, we use the
# default (which is also expanded relative to the root path). # default (which is also expanded relative to the root path).
if !root_path.nil? if !root_path.nil?
if !(ENV["VAGRANT_DOTFILE_PATH"] or "").empty? && !opts[:child] if !ENV["VAGRANT_DOTFILE_PATH"].to_s.empty? && !opts[:child]
opts[:local_data_path] ||= root_path.join(ENV["VAGRANT_DOTFILE_PATH"]) opts[:local_data_path] ||= Pathname.new(File.expand_path(ENV["VAGRANT_DOTFILE_PATH"], root_path))
else else
opts[:local_data_path] ||= root_path.join(DEFAULT_LOCAL_DATA) opts[:local_data_path] ||= root_path.join(DEFAULT_LOCAL_DATA)
end end

10
test/unit/vagrant/environment_test.rb
View File

@ -1030,6 +1030,16 @@ VF
end end
end end
context "with environmental variable VAGRANT_DOTFILE_PATH set with tilde" do
it "is set relative to the user's home directory" do
with_temp_env("VAGRANT_DOTFILE_PATH" => "~/.vagrant") do
instance = env.create_vagrant_env
expect(instance.cwd).to eq(env.workdir)
expect(instance.local_data_path.to_s).to eq(File.join(Dir.home, ".vagrant"))
end
end
end
describe "upgrading V1 dotfiles" do describe "upgrading V1 dotfiles" do
let(:v1_dotfile_tempfile) do let(:v1_dotfile_tempfile) do
Tempfile.new("vagrant-upgrade-dotfile").tap do |f| Tempfile.new("vagrant-upgrade-dotfile").tap do |f|