From 6301de9dcc3f56c68b2730db620e4f6f35f8d43d Mon Sep 17 00:00:00 2001 From: apainintheneck Date: Mon, 3 Oct 2022 18:13:33 -0700 Subject: [PATCH] Move Args#only_formula_or_cask to extend/os/linux --- Library/Homebrew/cli/args.rb | 3 ++- Library/Homebrew/extend/os/args.rb | 4 ++++ Library/Homebrew/extend/os/linux/args.rb | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 Library/Homebrew/extend/os/args.rb create mode 100644 Library/Homebrew/extend/os/linux/args.rb diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb index bb219dd9dd..3f2dc9de8c 100644 --- a/Library/Homebrew/cli/args.rb +++ b/Library/Homebrew/cli/args.rb @@ -96,7 +96,6 @@ module Homebrew end def only_formula_or_cask - return :formula if OS.linux? && !Homebrew::EnvConfig.developer? return :formula if formula? && !cask? return :cask if cask? && !formula? end @@ -153,3 +152,5 @@ module Homebrew end end end + +require "extend/os/args" diff --git a/Library/Homebrew/extend/os/args.rb b/Library/Homebrew/extend/os/args.rb new file mode 100644 index 0000000000..e497060e41 --- /dev/null +++ b/Library/Homebrew/extend/os/args.rb @@ -0,0 +1,4 @@ +# typed: false +# frozen_string_literal: true + +require "extend/os/linux/args" if OS.linux? diff --git a/Library/Homebrew/extend/os/linux/args.rb b/Library/Homebrew/extend/os/linux/args.rb new file mode 100644 index 0000000000..1d4b221909 --- /dev/null +++ b/Library/Homebrew/extend/os/linux/args.rb @@ -0,0 +1,17 @@ +# typed: false +# frozen_string_literal: true + +module Homebrew + module CLI + class Args + undef only_formula_or_cask + + def only_formula_or_cask + # Make formula the default on linux for non-developers + return :formula unless Homebrew::EnvConfig.developer? + return :formula if formula? && !cask? + return :cask if cask? && !formula? + end + end + end +end