From 161c3fb6a494a476e3ad0863af80a3fd34317451 Mon Sep 17 00:00:00 2001 From: Gautham Goli Date: Wed, 15 Jan 2020 20:26:58 +0530 Subject: [PATCH] ARGV: Replaces usages of ARGV.force? with Homebrew.args.force? --- Library/Homebrew/dev-cmd/extract.rb | 2 +- Library/Homebrew/dev-cmd/test.rb | 2 +- Library/Homebrew/extend/ARGV.rb | 4 ---- Library/Homebrew/formula_installer.rb | 2 +- Library/Homebrew/migrator.rb | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/dev-cmd/extract.rb b/Library/Homebrew/dev-cmd/extract.rb index 4a511a8184..8de687bae0 100644 --- a/Library/Homebrew/dev-cmd/extract.rb +++ b/Library/Homebrew/dev-cmd/extract.rb @@ -185,7 +185,7 @@ module Homebrew path = destination_tap.path/"Formula/#{name}@#{version}.rb" if path.exist? - unless ARGV.force? + unless Homebrew.args.force? odie <<~EOS Destination formula already exists: #{path} To overwrite it and continue anyways, run: diff --git a/Library/Homebrew/dev-cmd/test.rb b/Library/Homebrew/dev-cmd/test.rb index 47ae4412b3..924e28986a 100644 --- a/Library/Homebrew/dev-cmd/test.rb +++ b/Library/Homebrew/dev-cmd/test.rb @@ -52,7 +52,7 @@ module Homebrew end # Don't test unlinked formulae - if !ARGV.force? && !f.keg_only? && !f.linked? + if !Homebrew.args.force? && !f.keg_only? && !f.linked? ofail "#{f.full_name} is not linked" next end diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 3d5a6d5e5e..2058182142 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -45,10 +45,6 @@ module HomebrewArgvExtension flag_with_value&.delete_prefix(arg_prefix) end - def force? - flag? "--force" - end - def verbose? flag?("--verbose") || !ENV["VERBOSE"].nil? || !ENV["HOMEBREW_VERBOSE"].nil? end diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index aca3adc486..4cac338648 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -349,7 +349,7 @@ class FormulaInstaller end def check_conflicts - return if ARGV.force? + return if Homebrew.args.force? conflicts = formula.conflicts.select do |c| f = Formulary.factory(c.name) diff --git a/Library/Homebrew/migrator.rb b/Library/Homebrew/migrator.rb index 0c11faad79..7b393d5127 100644 --- a/Library/Homebrew/migrator.rb +++ b/Library/Homebrew/migrator.rb @@ -108,7 +108,7 @@ class Migrator end end - def initialize(formula, force: ARGV.force?) + def initialize(formula, force: Homebrew.args.force?) @oldname = formula.oldname @newname = formula.name raise MigratorNoOldnameError, formula unless oldname