Homebrew · issyl0 · Jul 15, 2024 · Jul 15, 2024 · Jul 15, 2024 · Jul 15, 2024
diff --git a/Formula/a/aarch64-elf-gcc.rb b/Formula/a/aarch64-elf-gcc.rb
@@ -50,7 +50,7 @@ def install
  system "make", "install-target-libgcc"
 
  # FSF-related man pages may conflict with native gcc
- (share/"man/man7").rmtree
+ rm_r(share/"man/man7")
  end
  end
 

diff --git a/Formula/a/agda.rb b/Formula/a/agda.rb
@@ -104,7 +104,7 @@ def install
  end
 
  # Clean up references to Homebrew shims in the standard library
- rm_rf "#{agdalib}/dist-newstyle/cache"
+ rm_r("#{agdalib}/dist-newstyle/cache")
 
  # generate the cubical library's documentation files
  cubicallib = agdalib/"cubical"

diff --git a/Formula/a/allure.rb b/Formula/a/allure.rb
@@ -18,7 +18,7 @@ class Allure < Formula
 
  def install
  # Remove all windows files
- rm_f Dir["bin/*.bat"]
+ rm(Dir["bin/*.bat"])
 
  prefix.install_metafiles
  libexec.install Dir["*"]

diff --git a/Formula/a/alluxio.rb b/Formula/a/alluxio.rb
@@ -35,7 +35,7 @@ def install
  bin.env_script_all_files libexec/"bin", Language::Java.overridable_java_home_env("11")
  chmod "+x", Dir["#{libexec}/bin/*"]
 
- rm_rf Dir["#{etc}/alluxio/*"]
+ rm_r(Dir["#{etc}/alluxio/*"])
 
  (etc/"alluxio").install libexec/"conf/alluxio-env.sh.template" => "alluxio-env.sh"
  ln_sf "#{etc}/alluxio/alluxio-env.sh", "#{libexec}/conf/alluxio-env.sh"

diff --git a/Formula/a/apache-archiva.rb b/Formula/a/apache-archiva.rb
@@ -26,8 +26,8 @@ class ApacheArchiva < Formula
 
  def install
  libexec.install Dir["*"]
- rm_f libexec.glob("bin/wrapper*")
- rm_f libexec.glob("lib/libwrapper*")
+ rm(libexec.glob("bin/wrapper*"))
+ rm(libexec.glob("lib/libwrapper*"))
  (bin/"archiva").write_env_script libexec/"bin/archiva", Language::Java.java_home_env
 
  wrapper = Formula["java-service-wrapper"].opt_libexec

diff --git a/Formula/a/apache-drill.rb b/Formula/a/apache-drill.rb
@@ -24,11 +24,11 @@ class ApacheDrill < Formula
  depends_on "openjdk@11"
 
  def install
- rm_f Dir["bin/*.bat"]
+ rm(Dir["bin/*.bat"])
  libexec.install Dir["*"]
  bin.install Dir["#{libexec}/bin/*"]
  bin.env_script_all_files(libexec/"bin", Language::Java.java_home_env("11"))
- rm_f Dir["#{bin}/*.txt"]
+ rm(Dir["#{bin}/*.txt"])
  end
 
  test do

diff --git a/Formula/a/apache-geode.rb b/Formula/a/apache-geode.rb
@@ -14,7 +14,7 @@ class ApacheGeode < Formula
  depends_on "openjdk@11"
 
  def install
- rm_f "bin/gfsh.bat"
+ rm("bin/gfsh.bat")
  bash_completion.install "bin/gfsh-completion.bash" => "gfsh"
  libexec.install Dir["*"]
  (bin/"gfsh").write_env_script libexec/"bin/gfsh", Language::Java.java_home_env("11")

diff --git a/Formula/a/apache-pulsar.rb b/Formula/a/apache-pulsar.rb
@@ -42,8 +42,8 @@ def install
  system "tar", "-xf", "distribution/server/target/#{binpfx}-bin.tar.gz"
  libexec.install "#{binpfx}/bin", "#{binpfx}/lib", "#{binpfx}/instances", "#{binpfx}/conf", "#{binpfx}/trino"
  libexec.glob("bin/*.cmd").map(&:unlink)
- (libexec/"trino/bin/procname/Linux-aarch64").rmtree
- (libexec/"trino/bin/procname/Linux-ppc64le").rmtree
+ rm_r(libexec/"trino/bin/procname/Linux-aarch64")
+ rm_r(libexec/"trino/bin/procname/Linux-ppc64le")
  pkgshare.install "#{binpfx}/examples"
  (etc/"pulsar").install_symlink libexec/"conf"
 

diff --git a/Formula/a/apache-spark.rb b/Formula/a/apache-spark.rb
@@ -25,7 +25,7 @@ def install
  # Rename beeline to distinguish it from hive's beeline
  mv "bin/beeline", "bin/spark-beeline"
 
- rm_f Dir["bin/*.cmd"]
+ rm(Dir["bin/*.cmd"])
  libexec.install Dir["*"]
  bin.install Dir[libexec/"bin/*"]
  bin.env_script_all_files(libexec/"bin", JAVA_HOME: Language::Java.overridable_java_home_env("17")[:JAVA_HOME])

diff --git a/Formula/a/apt-dater.rb b/Formula/a/apt-dater.rb
@@ -40,7 +40,7 @@ def install
  system "make", "install"
  # Global config overrides local config, so delete global config to prioritize the
  # config in $HOME/.config/apt-dater
- (prefix/"etc").rmtree
+ rm_r(prefix/"etc")
  end
 
  test do

diff --git a/Formula/a/archi-steam-farm.rb b/Formula/a/archi-steam-farm.rb
@@ -36,7 +36,7 @@ def install
  EOS
 
  etc.install libexec/"config" => "asf"
- rm_rf libexec/"config"
+ rm_r(libexec/"config")
  libexec.install_symlink etc/"asf" => "config"
  end
 

diff --git a/Formula/a/argyll-cms.rb b/Formula/a/argyll-cms.rb
@@ -70,7 +70,7 @@ def install
  end
 
  # Remove bundled libraries to prevent fallback
- %w[jpeg png tiff zlib].each { |l| (buildpath/l).rmtree }
+ %w[jpeg png tiff zlib].each { |l| rm_r(buildpath/l) }
 
  inreplace "Jamtop" do |s|
  openssl = Formula["openssl@3"]

diff --git a/Formula/a/arm-none-eabi-gcc.rb b/Formula/a/arm-none-eabi-gcc.rb
@@ -50,7 +50,7 @@ def install
  system "make", "install-target-libgcc"
 
  # FSF-related man pages may conflict with native gcc
- (share/"man/man7").rmtree
+ rm_r(share/"man/man7")
  end
  end
 

diff --git a/Formula/a/arrayfire.rb b/Formula/a/arrayfire.rb
@@ -61,11 +61,11 @@ def install
  system "cmake", "--install", "build"
 
  # Remove debug info. These files make patchelf fail.
- rm_f [
+ rm([
  lib/"libaf.debug",
  lib/"libafcpu.debug",
  lib/"libafopencl.debug",
- ]
+ ])
  pkgshare.install "examples"
  end
 

diff --git a/Formula/a/asciidoctorj.rb b/Formula/a/asciidoctorj.rb
@@ -23,7 +23,7 @@ class Asciidoctorj < Formula
  depends_on "openjdk"
 
  def install
- rm_rf Dir["bin/*.bat"] # Remove Windows files.
+ rm_r(Dir["bin/*.bat"]) # Remove Windows files.
  libexec.install Dir["*"]
  (bin/"asciidoctorj").write_env_script libexec/"bin/asciidoctorj", JAVA_HOME: Formula["openjdk"].opt_prefix
  end

diff --git a/Formula/a/atomist-cli.rb b/Formula/a/atomist-cli.rb
@@ -33,7 +33,7 @@ def install
  bash_completion.install libexec/"lib/node_modules/@atomist/cli/assets/bash_completion/atomist"
 
  term_size_vendor_dir = libexec/"lib/node_modules/@atomist/cli/node_modules/term-size/vendor"
- term_size_vendor_dir.rmtree # remove pre-built binaries
+ rm_r(term_size_vendor_dir) # remove pre-built binaries
 
  if OS.mac?
  macos_dir = term_size_vendor_dir/"macos"

diff --git a/Formula/a/auditbeat.rb b/Formula/a/auditbeat.rb
@@ -24,7 +24,7 @@ class Auditbeat < Formula
 
  def install
  # remove non open source files
- rm_rf "x-pack"
+ rm_r("x-pack")
 
  cd "auditbeat" do
  # don't build docs because it would fail creating the combined OSS/x-pack

diff --git a/Formula/a/autoconf.rb b/Formula/a/autoconf.rb
@@ -35,7 +35,7 @@ def install
  system "./configure", "--prefix=#{prefix}", "--with-lispdir=#{elisp}"
  system "make", "install"
 
- rm_f info/"standards.info"
+ rm(info/"standards.info")
  end
 
  test do

diff --git a/Formula/a/[email protected] b/Formula/a/[email protected]
@@ -43,7 +43,7 @@ def install
  system "./configure", "--prefix=#{prefix}", "--with-lispdir=#{elisp}"
  system "make", "install"
 
- rm_f info/"standards.info"
+ rm(info/"standards.info")
  end
 
  test do

diff --git a/Formula/a/aws-amplify.rb b/Formula/a/aws-amplify.rb
@@ -24,8 +24,8 @@ def install
  bin.install_symlink Dir["#{libexec}/bin/*"]
 
  unless Hardware::CPU.intel?
- rm_rf "#{libexec}/lib/node_modules/@aws-amplify/cli-internal/node_modules" \
-  "/@aws-amplify/amplify-frontend-ios/resources/amplify-xcode"
+ rm_r("#{libexec}/lib/node_modules/@aws-amplify/cli-internal/node_modules" \
+ "/@aws-amplify/amplify-frontend-ios/resources/amplify-xcode")
  end
 
  # Remove non-native libsqlite4java files

diff --git a/Formula/b/balena-cli.rb b/Formula/b/balena-cli.rb
@@ -46,13 +46,13 @@ def install
  arch = Hardware::CPU.intel? ? "x64" : Hardware::CPU.arch.to_s
  node_modules = libexec/"lib/node_modules/balena-cli/node_modules"
  node_modules.glob("{ffi-napi,ref-napi}/prebuilds/*")
- .each { |dir| dir.rmtree if dir.basename.to_s != "#{os}-#{arch}" }
+ .each { |dir| rm_r(dir) if dir.basename.to_s != "#{os}-#{arch}" }
 
- (node_modules/"lzma-native/build").rmtree
- (node_modules/"usb").rmtree if OS.linux?
+ rm_r(node_modules/"lzma-native/build")
+ rm_r(node_modules/"usb") if OS.linux?
 
  term_size_vendor_dir = node_modules/"term-size/vendor"
- term_size_vendor_dir.rmtree # remove pre-built binaries
+ rm_r(term_size_vendor_dir) # remove pre-built binaries
 
  if OS.mac?
  macos_dir = term_size_vendor_dir/"macos"

diff --git a/Formula/b/bamtools.rb b/Formula/b/bamtools.rb
@@ -28,7 +28,7 @@ class Bamtools < Formula
 
  def install
  # Delete bundled jsoncpp to avoid fallback
- (buildpath/"src/third_party/jsoncpp").rmtree
+ rm_r(buildpath/"src/third_party/jsoncpp")
 
  # Build shared library
  system "cmake", "-S", ".", "-B", "build_shared",

diff --git a/Formula/b/basex.rb b/Formula/b/basex.rb
@@ -25,9 +25,9 @@ class Basex < Formula
 
  def install
  rm Dir["bin/*.bat"]
- rm_rf "repo"
- rm_rf "data"
- rm_rf "etc"
+ rm_r("repo")
+ rm_r("data")
+ rm_r("etc")
  prefix.install_metafiles
  libexec.install Dir["*"]
  bin.install Dir["#{libexec}/bin/*"]

diff --git a/Formula/b/bee.rb b/Formula/b/bee.rb
@@ -18,7 +18,7 @@ class Bee < Formula
  depends_on "openjdk"
 
  def install
- rm_rf Dir["bin/*.bat"]
+ rm_r(Dir["bin/*.bat"])
  libexec.install Dir["*"]
  (bin/"bee").write_env_script libexec/"bin/bee", Language::Java.java_home_env
  end

diff --git a/Formula/b/benerator.rb b/Formula/b/benerator.rb
@@ -14,7 +14,7 @@ class Benerator < Formula
 
  def install
  # Remove unnecessary files
- rm_f Dir["bin/*.bat", "bin/pom.xml"]
+ rm(Dir["bin/*.bat", "bin/pom.xml"])
 
  # Installs only the "bin" and "lib" directories from the tarball
  libexec.install Dir["bin", "lib"]

diff --git a/Formula/b/berkeley-db.rb b/Formula/b/berkeley-db.rb
@@ -60,7 +60,7 @@ def install
  system "make", "install", "DOCLIST=license"
 
  # delete docs dir because it is huge
- rm_rf prefix/"docs"
+ rm_r(prefix/"docs")
  end
  end
 

diff --git a/Formula/b/bit.rb b/Formula/b/bit.rb
@@ -39,11 +39,13 @@ def install
  arch = Hardware::CPU.intel? ? "x64" : Hardware::CPU.arch.to_s
  node_modules = libexec/"lib/node_modules/bit-bin/node_modules"
  (node_modules/"leveldown/prebuilds/linux-x64/node.napi.musl.node").unlink
- (node_modules/"leveldown/prebuilds").each_child { |dir| dir.rmtree if dir.basename.to_s != "#{os}-#{arch}" }
+ (node_modules/"leveldown/prebuilds").each_child do |dir|
+ rm_r(dir) if dir.basename.to_s != "#{os}-#{arch}"
+ end
 
  # Remove vendored pre-built binary `terminal-notifier`
  node_notifier_vendor_dir = node_modules/"node-notifier/vendor"
- node_notifier_vendor_dir.rmtree # remove vendored pre-built binaries
+ rm_r(node_notifier_vendor_dir) # remove vendored pre-built binaries
 
  if OS.mac?
  terminal_notifier_dir = node_notifier_vendor_dir/"mac.noindex"

diff --git a/Formula/b/bloaty.rb b/Formula/b/bloaty.rb
@@ -34,7 +34,7 @@ def install
  # https://github.com/protocolbuffers/protobuf/issues/9947
  ENV.append_to_cflags "-DNDEBUG"
  # Remove vendored dependencies
- %w[abseil-cpp capstone protobuf re2].each { |dir| (buildpath/"third_party"/dir).rmtree }
+ %w[abseil-cpp capstone protobuf re2].each { |dir| rm_r(buildpath/"third_party"/dir) }
  abseil_cxx_standard = 17 # Keep in sync with C++ standard in abseil.rb
  inreplace "CMakeLists.txt", "CMAKE_CXX_STANDARD 11", "CMAKE_CXX_STANDARD #{abseil_cxx_standard}"
  inreplace "CMakeLists.txt", "-std=c++11", "-std=c++17"

diff --git a/Formula/b/byteman.rb b/Formula/b/byteman.rb
@@ -24,7 +24,7 @@ class Byteman < Formula
  depends_on "openjdk"
 
  def install
- rm_rf Dir["bin/*.bat"]
+ rm_r(Dir["bin/*.bat"])
  doc.install Dir["docs/*"], "README"
  libexec.install ["bin", "lib", "contrib"]
  pkgshare.install ["sample"]

diff --git a/Formula/c/ca-certificates.rb b/Formula/c/ca-certificates.rb
@@ -121,7 +121,7 @@ def macos_post_install
  end
 
  def linux_post_install
- rm_f pkgetc/"cert.pem"
+ rm(pkgetc/"cert.pem")
  pkgetc.mkpath
  cp pkgshare/"cacert.pem", pkgetc/"cert.pem"
  end

diff --git a/Formula/c/cartridge-cli.rb b/Formula/c/cartridge-cli.rb
@@ -30,7 +30,7 @@ def install
 
  test do
  project_path = Pathname("test-project")
- project_path.rmtree if project_path.exist?
+ rm_r(project_path) if project_path.exist?
  system bin/"cartridge", "create", "--name", project_path
  assert_predicate project_path, :exist?
  assert_predicate project_path.join("init.lua"), :exist?

diff --git a/Formula/c/cconv.rb b/Formula/c/cconv.rb
@@ -32,7 +32,7 @@ def install
  system "autoreconf", "-fvi"
  system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
  system "make", "install"
- rm_f include/"unicode.h"
+ rm(include/"unicode.h")
  end
 
  test do

diff --git a/Formula/c/cdktf.rb b/Formula/c/cdktf.rb
@@ -32,7 +32,7 @@ def install
  node_modules = libexec/"lib/node_modules/cdktf-cli/node_modules"
  node_pty_prebuilds = node_modules/"@cdktf/node-pty-prebuilt-multiarch/prebuilds"
  (node_pty_prebuilds/"linux-x64").glob("node.abi*.musl.node").map(&:unlink)
- node_pty_prebuilds.each_child { |dir| dir.rmtree if dir.basename.to_s != "#{os}-#{arch}" }
+ node_pty_prebuilds.each_child { |dir| rm_r(dir) if dir.basename.to_s != "#{os}-#{arch}" }
 
  generate_completions_from_executable(libexec/"bin/cdktf", "completion",
  shells: [:bash, :zsh], shell_parameter_format: :none)

diff --git a/Formula/c/cdrtools.rb b/Formula/c/cdrtools.rb
@@ -37,18 +37,18 @@ def install
  # This could be done by dropping each occurrence of *_p.mk from the definition
  # of MK_FILES in every lib*/Makefile. But it is much easier to just remove all
  # lib*/*_p.mk files. The latter method produces warnings but works fine.
- rm_f Dir["lib*/*_p.mk"]
+ rm(Dir["lib*/*_p.mk"])
  # CFLAGS is required to work around autoconf breakages as of 3.02a
  system "smake", "INS_BASE=#{prefix}", "INS_RBASE=#{prefix}",
  "CFLAGS=-Wno-implicit-function-declaration",
  "install"
  # cdrtools tries to install some generic smake headers, libraries and
  # manpages, which conflict with the copies installed by smake itself
- (include/"schily").rmtree
+ rm_r(include/"schily")
  %w[libschily.a libdeflt.a libfind.a].each do |file|
  (lib/file).unlink
  end
- man5.rmtree
+ rm_r(man5)
  end
 
  test do

diff --git a/Formula/c/cdxgen.rb b/Formula/c/cdxgen.rb
@@ -36,7 +36,7 @@ def install
 
  # remove pre-built osquery plugin for macos intel builds
  osquery_plugin = node_modules/"@cyclonedx/cdxgen-plugins-bin-darwin-amd64/plugins/osquery"
- osquery_plugin.rmtree if OS.mac? && Hardware::CPU.intel?
+ rm_r(osquery_plugin) if OS.mac? && Hardware::CPU.intel?
  end
 
  test do

diff --git a/Formula/c/cfr-decompiler.rb b/Formula/c/cfr-decompiler.rb
@@ -55,7 +55,7 @@ def install
  mkdir doc/"javadoc"
  cd doc/"javadoc" do
  system Formula["openjdk@11"].bin/"jar", "-xf", doc/doc_jar
- rm_rf "META-INF"
+ rm_r("META-INF")
  end
  end
  end

diff --git a/Formula/c/chapel.rb b/Formula/c/chapel.rb
@@ -81,13 +81,13 @@ def install
  system "make", "mason"
  system "make", "cleanall"
 
- rm_rf("third-party/llvm/llvm-src/")
- rm_rf("third-party/gasnet/gasnet-src")
- rm_rf("third-party/libfabric/libfabric-src")
- rm_rf("third-party/fltk/fltk-1.3.5-source.tar.gz")
- rm_rf("third-party/libunwind/libunwind-1.1.tar.gz")
- rm_rf("third-party/gmp/gmp-src/")
- rm_rf("third-party/qthread/qthread-src/installed")
+ rm_r("third-party/llvm/llvm-src/")
+ rm_r("third-party/gasnet/gasnet-src")
+ rm_r("third-party/libfabric/libfabric-src")
+ rm_r("third-party/fltk/fltk-1.3.5-source.tar.gz")
+ rm_r("third-party/libunwind/libunwind-1.1.tar.gz")
+ rm_r("third-party/gmp/gmp-src/")
+ rm_r("third-party/qthread/qthread-src/installed")
  end
 
  # Install chpl and other binaries (e.g. chpldoc) into bin/ as exec scripts.