From 3d24da1904afef0203c1db9651819a9d2788dc7b Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 7 Mar 2024 13:13:28 -0800 Subject: [PATCH] Add support for the `--overwrite` flag to `brew upgrade` to govern the keg-linking step `FormulaInstaller` already supports this (https://github.com/Homebrew/brew/pull/12691) but I didn't wire it up via `brew upgrade` and the two can be used largely interchangeably --- Library/Homebrew/cmd/upgrade.rb | 4 ++++ Library/Homebrew/upgrade.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index ed712f3070..e0f81e2ad0 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -75,6 +75,9 @@ module Homebrew env: :display_install_times, description: "Print install times for each package at the end of the run.", }], + [:switch, "--overwrite", { + description: "Delete files that already exist in the prefix while linking.", + }], ].each do |args| options = args.pop send(*args, **options) @@ -229,6 +232,7 @@ module Homebrew keep_tmp: args.keep_tmp?, debug_symbols: args.debug_symbols?, force: args.force?, + overwrite: args.overwrite?, debug: args.debug?, quiet: args.quiet?, verbose: args.verbose?, diff --git a/Library/Homebrew/upgrade.rb b/Library/Homebrew/upgrade.rb index 5fc1ea71e8..36efd33b19 100644 --- a/Library/Homebrew/upgrade.rb +++ b/Library/Homebrew/upgrade.rb @@ -27,6 +27,7 @@ module Homebrew keep_tmp: false, debug_symbols: false, force: false, + overwrite: false, debug: false, quiet: false, verbose: false @@ -65,6 +66,7 @@ module Homebrew keep_tmp: keep_tmp, debug_symbols: debug_symbols, force: force, + overwrite: overwrite, debug: debug, quiet: quiet, verbose: verbose, @@ -150,6 +152,7 @@ module Homebrew keep_tmp: false, debug_symbols: false, force: false, + overwrite: false, debug: false, quiet: false, verbose: false @@ -184,6 +187,7 @@ module Homebrew keep_tmp: keep_tmp, debug_symbols: debug_symbols, force: force, + overwrite: overwrite, debug: debug, quiet: quiet, verbose: verbose,