From a6bc9e155a0a34c92d5b31fbf68ee76003b071d4 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Thu, 23 Jul 2020 02:43:22 +0200 Subject: [PATCH] Add helper functions for `--cache` and `fetch` explicitly. --- Library/Homebrew/cmd/--cache.rb | 4 +++- Library/Homebrew/cmd/fetch.rb | 4 +++- Library/Homebrew/fetch.rb | 6 ++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cmd/--cache.rb b/Library/Homebrew/cmd/--cache.rb index 1dd0bb2c5e..191f018c3f 100644 --- a/Library/Homebrew/cmd/--cache.rb +++ b/Library/Homebrew/cmd/--cache.rb @@ -6,6 +6,8 @@ require "cask/cmd" require "cask/cask_loader" module Homebrew + extend Fetch + module_function def __cache_args @@ -58,7 +60,7 @@ module Homebrew def print_formula_cache(name) formula = Formulary.factory name - if Fetch.fetch_bottle?(formula) + if fetch_bottle?(formula) puts formula.bottle.cached_download else puts formula.cached_download diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb index 2f5045bccf..362af7506a 100644 --- a/Library/Homebrew/cmd/fetch.rb +++ b/Library/Homebrew/cmd/fetch.rb @@ -5,6 +5,8 @@ require "fetch" require "cli/parser" module Homebrew + extend Fetch + module_function def fetch_args @@ -62,7 +64,7 @@ module Homebrew f.print_tap_action verb: "Fetching" fetched_bottle = false - if Fetch.fetch_bottle?(f) + if fetch_bottle?(f) begin fetch_formula(f.bottle) rescue Interrupt diff --git a/Library/Homebrew/fetch.rb b/Library/Homebrew/fetch.rb index 6564aaf955..4db267aa72 100644 --- a/Library/Homebrew/fetch.rb +++ b/Library/Homebrew/fetch.rb @@ -2,12 +2,10 @@ module Homebrew module Fetch - module_function - def fetch_bottle?(f) - return true if Homebrew.args.force_bottle? && f.bottle + return true if args.force_bottle? && f.bottle return false unless f.bottle && f.pour_bottle? - return false if Homebrew.args.build_formula_from_source?(f) + return false if args.build_formula_from_source?(f) return false unless f.bottle.compatible_cellar? true