Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/mixlib/install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#

require "mixlib/versioning"
require "mixlib/shellout" unless defined?(Mixlib::ShellOut)

require_relative "install/backend"
require_relative "install/options"
Expand Down Expand Up @@ -252,6 +251,12 @@ def detect_platform
# Returns a Hash containing the platform info options
#
def self.detect_platform
# mixlib-shellout (and the etc, fileutils, tmpdir and fcntl trees it
# pulls in) is only needed to shell out for platform detection, so it is
# loaded here rather than at require time.
require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
require "tmpdir"

output = if Gem.win_platform?
# For Windows we write the detect platform script and execute the
# powershell.exe program with Mixlib::ShellOut
Expand Down
1 change: 1 addition & 0 deletions spec/functional/mixlib/install/cli_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

require "spec_helper"
require "mixlib/install/cli"
require "mixlib/shellout"
require "tmpdir"

describe "mixlib-install executable" do
Expand Down
Loading