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

ARGV: Deprecate ARGV.interactive?

Browse Source
This commit is contained in:
Gautham G 2020-03-14 19:49:15 +05:30
parent db121c7b17
commit 1292c4559c
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/build.rb
View File

@ -126,7 +126,7 @@ class Build
system "git", "init" system "git", "init"
system "git", "add", "-A" system "git", "add", "-A"
end end
if ARGV.interactive? if Homebrew.args.interactive?
ohai "Entering interactive mode" ohai "Entering interactive mode"
puts "Type `exit` to return and finalize the installation." puts "Type `exit` to return and finalize the installation."
puts "Install to this prefix: #{formula.prefix}" puts "Install to this prefix: #{formula.prefix}"

4
Library/Homebrew/extend/ARGV.rb
View File

@ -31,10 +31,6 @@ module HomebrewArgvExtension
flag?("--debug") || !ENV["HOMEBREW_DEBUG"].nil? flag?("--debug") || !ENV["HOMEBREW_DEBUG"].nil?
end end
def interactive?
flag? "--interactive"
end
def keep_tmp? def keep_tmp?
include? "--keep-tmp" include? "--keep-tmp"
end end

4
Library/Homebrew/formula.rb
View File

@ -1132,7 +1132,7 @@ class Formula
begin begin
yield self, staging yield self, staging
rescue rescue
staging.retain! if ARGV.interactive? || ARGV.debug? staging.retain! if Homebrew.args.interactive? || ARGV.debug?
raise raise
ensure ensure
cp Dir["config.log", "CMakeCache.txt"], logs cp Dir["config.log", "CMakeCache.txt"], logs
@ -2084,7 +2084,7 @@ class Formula
HOMEBREW_PATH: nil, HOMEBREW_PATH: nil,
} }
unless ARGV.interactive? unless Homebrew.args.interactive?
stage_env[:HOME] = env_home stage_env[:HOME] = env_home
stage_env[:_JAVA_OPTIONS] = stage_env[:_JAVA_OPTIONS] =
"#{ENV["_JAVA_OPTIONS"]&.+(" ")}-Duser.home=#{HOMEBREW_CACHE}/java_cache" "#{ENV["_JAVA_OPTIONS"]&.+(" ")}-Duser.home=#{HOMEBREW_CACHE}/java_cache"

2
Library/Homebrew/formula_installer.rb
View File

@ -752,7 +752,7 @@ class FormulaInstaller
sandbox = Sandbox.new sandbox = Sandbox.new
formula.logs.mkpath formula.logs.mkpath
sandbox.record_log(formula.logs/"build.sandbox.log") sandbox.record_log(formula.logs/"build.sandbox.log")
sandbox.allow_write_path(ENV["HOME"]) if ARGV.interactive? sandbox.allow_write_path(ENV["HOME"]) if Homebrew.args.interactive?
sandbox.allow_write_temp_and_cache sandbox.allow_write_temp_and_cache
sandbox.allow_write_log(formula) sandbox.allow_write_log(formula)
sandbox.allow_cvs sandbox.allow_cvs

2
Library/Homebrew/reinstall.rb
View File

@ -26,7 +26,7 @@ module Homebrew
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f)
fi.options = options fi.options = options
fi.build_bottle = ARGV.build_bottle? fi.build_bottle = ARGV.build_bottle?
fi.interactive = ARGV.interactive? fi.interactive = Homebrew.args.interactive?
fi.git = ARGV.git? fi.git = ARGV.git?
fi.link_keg ||= keg_was_linked if keg_had_linked_opt fi.link_keg ||= keg_was_linked if keg_had_linked_opt
fi.build_from_source = true if build_from_source fi.build_from_source = true if build_from_source