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

Merge pull request #8749 from chrisroberts/platform/cygwin-detection 

Remove PATH based cygwin detection
This commit is contained in:
Chris Roberts 2017-07-06 10:15:30 -07:00 committed by GitHub
parent 1c1a791226 954569d1fc
commit 8dbb5d55a4
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/vagrant/util/platform.rb
View File

@ -11,21 +11,12 @@ module Vagrant
class Platform
class << self
def cygwin?
return @_cygwin if defined?(@_cygwin)
@_cygwin = -> {
# Installer detects Cygwin
return true if ENV["VAGRANT_DETECTED_OS"] &&
ENV["VAGRANT_DETECTED_OS"].downcase.include?("cygwin")
# Ruby running in Cygwin
return true if platform.include?("cygwin")
# Heuristic. If the path contains Cygwin, we just assume we're
# in Cygwin. It is generally a safe bet.
path = ENV["PATH"] || ""
return path.include?("cygwin")
}.call
return @_cygwin
if !defined?(@_cygwin)
@_cygwin = ENV["VAGRANT_DETECTED_OS"].to_s.downcase.include?("cygwin") ||
platform.include?("cygwin") ||
ENV["OSTYPE"].to_s.downcase.include?("cygwin")
end
@_cygwin
end
def wsl?

10
test/unit/vagrant/util/platform_test.rb
View File

@ -29,14 +29,20 @@ describe Vagrant::Util::Platform do
end
end
it "returns true if OSTYPE includes cygwin" do
with_temp_env(OSTYPE: "cygwin") do
expect(subject).to be_cygwin
end
end
it "returns true if platform has cygwin" do
allow(subject).to receive(:platform).and_return("cygwin")
expect(subject).to be_cygwin
end
it "returns true if the PATH contains cygwin" do
it "returns false if the PATH contains cygwin" do
with_temp_env(PATH: "C:/cygwin") do
expect(subject).to be_cygwin
expect(subject).to_not be_cygwin
end
end