admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Always add cask/lib to $LOAD_PATH.

Browse Source
This commit is contained in:
Markus Reiter 2018-06-07 16:50:09 +02:00
parent 1bfec5066a
commit 42e34db562
6 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/brew.rb
View File

@ -20,6 +20,10 @@ unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s)
$LOAD_PATH.unshift(HOMEBREW_LIBRARY_PATH.to_s) $LOAD_PATH.unshift(HOMEBREW_LIBRARY_PATH.to_s)
end end
unless $LOAD_PATH.include?("#{HOMEBREW_LIBRARY_PATH}/cask/lib")
$LOAD_PATH.unshift("#{HOMEBREW_LIBRARY_PATH}/cask/lib")
end
require "global" require "global"
begin begin

1
Library/Homebrew/cmd/cask.rb
View File

@ -1,4 +1,3 @@
$LOAD_PATH.unshift("#{HOMEBREW_LIBRARY_PATH}/cask/lib")
require "hbc" require "hbc"
module Homebrew module Homebrew

1
Library/Homebrew/dev-cmd/irb.rb
View File

@ -47,7 +47,6 @@ module Homebrew
require "formula" require "formula"
require "keg" require "keg"
$LOAD_PATH.unshift("#{HOMEBREW_LIBRARY_PATH}/cask/lib")
require "hbc" require "hbc"
ohai "Interactive Homebrew Shell" ohai "Interactive Homebrew Shell"

1
Library/Homebrew/test/spec_helper.rb
View File

@ -15,6 +15,7 @@ require "rubocop/rspec/support"
require "find" require "find"
$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_LIBRARY"]}/Homebrew")) $LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_LIBRARY"]}/Homebrew"))
$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/cask/lib"))
$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/test/support/lib")) $LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/test/support/lib"))
require "global" require "global"

2
Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
View File

@ -1,5 +1,3 @@
$LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.join("cask", "lib").to_s)
require "hbc" require "hbc"
require "test/support/helper/cask/fake_system_command" require "test/support/helper/cask/fake_system_command"

1
Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
View File

@ -85,6 +85,7 @@ RSpec.shared_context "integration test" do
"-W0", "-W0",
"-I", "#{HOMEBREW_LIBRARY_PATH}/test/support/lib", "-I", "#{HOMEBREW_LIBRARY_PATH}/test/support/lib",
"-I", HOMEBREW_LIBRARY_PATH.to_s, "-I", HOMEBREW_LIBRARY_PATH.to_s,
"-I", "#{HOMEBREW_LIBRARY_PATH}/cask/lib",
"-rconfig" "-rconfig"
] ]
if ENV["HOMEBREW_TESTS_COVERAGE"] if ENV["HOMEBREW_TESTS_COVERAGE"]