Merge pull request #178798 from Homebrew/t-rubocop-no-rmrf

t*: Fix `Homebrew/NoFileutilsRmrf` RuboCop offenses
Homebrew · Jul 31, 2024 · 53d2869 · 53d2869
2 parents 708c4b3 + 8b0b340
commit 53d2869
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/Formula/t/texlive.rb b/Formula/t/texlive.rb
@@ -400,9 +400,9 @@ def install
  end
 
  # Clean unused files
- rm_rf share/"texmf-dist/doc"
- rm_rf share/"tlpkg/installer/wget"
- rm_rf share/"tlpkg/installer/xz"
+ rm_r(share/"texmf-dist/doc")
+ rm_r(share/"tlpkg/installer/wget")
+ rm_r(share/"tlpkg/installer/xz")
 
  # Set up config files to use the correct path for the TeXLive root
  inreplace buildpath/"texk/kpathsea/texmf.cnf",

diff --git a/Formula/t/tin.rb b/Formula/t/tin.rb
@@ -34,7 +34,7 @@ class Tin < Formula
 
  def install
  # Remove bundled libraries
- %w[intl pcre].each { |l| (buildpath/l).rmtree }
+ %w[intl pcre].each { |l| rm_r(buildpath/l) }
 
  system "./configure", *std_configure_args,
  "--mandir=#{man}",

diff --git a/Formula/t/tomcat.rb b/Formula/t/tomcat.rb
@@ -20,7 +20,7 @@ class Tomcat < Formula
 
  def install
  # Remove Windows scripts
- rm_rf Dir["bin/*.bat"]
+ rm_r(Dir["bin/*.bat"])
 
  # Install files
  prefix.install %w[NOTICE LICENSE RELEASE-NOTES RUNNING.txt]

diff --git a/Formula/t/[email protected] b/Formula/t/[email protected]
@@ -23,7 +23,7 @@ class TomcatAT7 < Formula
 
  def install
  # Remove Windows scripts
- rm_rf Dir["bin/*.bat"]
+ rm_r(Dir["bin/*.bat"])
 
  # Install files
  prefix.install %w[NOTICE LICENSE RELEASE-NOTES RUNNING.txt]

diff --git a/Formula/t/[email protected] b/Formula/t/[email protected]
@@ -23,7 +23,7 @@ class TomcatAT8 < Formula
 
  def install
  # Remove Windows scripts
- rm_rf Dir["bin/*.bat"]
+ rm_r(Dir["bin/*.bat"])
 
  # Install files
  prefix.install %w[NOTICE LICENSE RELEASE-NOTES RUNNING.txt]

diff --git a/Formula/t/[email protected] b/Formula/t/[email protected]
@@ -26,7 +26,7 @@ class TomcatAT9 < Formula
 
  def install
  # Remove Windows scripts
- rm_rf Dir["bin/*.bat"]
+ rm_r(Dir["bin/*.bat"])
 
  # Install files
  prefix.install %w[NOTICE LICENSE RELEASE-NOTES RUNNING.txt]

diff --git a/Formula/t/tomee-plume.rb b/Formula/t/tomee-plume.rb
@@ -14,9 +14,9 @@ class TomeePlume < Formula
 
  def install
  # Remove Windows scripts
- rm_rf Dir["bin/*.bat"]
- rm_rf Dir["bin/*.bat.original"]
- rm_rf Dir["bin/*.exe"]
+ rm_r(Dir["bin/*.bat"])
+ rm_r(Dir["bin/*.bat.original"])
+ rm_r(Dir["bin/*.exe"])
 
  # Install files
  prefix.install %w[NOTICE LICENSE RELEASE-NOTES RUNNING.txt]

diff --git a/Formula/t/tomee-plus.rb b/Formula/t/tomee-plus.rb
@@ -14,9 +14,9 @@ class TomeePlus < Formula
 
  def install
  # Remove Windows scripts
- rm_rf Dir["bin/*.bat"]
- rm_rf Dir["bin/*.bat.original"]
- rm_rf Dir["bin/*.exe"]
+ rm_r(Dir["bin/*.bat"])
+ rm_r(Dir["bin/*.bat.original"])
+ rm_r(Dir["bin/*.exe"])
 
  # Install files
  prefix.install %w[NOTICE LICENSE RELEASE-NOTES RUNNING.txt]

diff --git a/Formula/t/tomee-webprofile.rb b/Formula/t/tomee-webprofile.rb
@@ -14,9 +14,9 @@ class TomeeWebprofile < Formula
 
  def install
  # Remove Windows scripts
- rm_rf Dir["bin/*.bat"]
- rm_rf Dir["bin/*.bat.original"]
- rm_rf Dir["bin/*.exe"]
+ rm_r(Dir["bin/*.bat"])
+ rm_r(Dir["bin/*.bat.original"])
+ rm_r(Dir["bin/*.exe"])
 
  # Install files
  prefix.install %w[NOTICE LICENSE RELEASE-NOTES RUNNING.txt]

diff --git a/Formula/t/travis.rb b/Formula/t/travis.rb
@@ -182,7 +182,7 @@ def install
  system "gem", "build", "travis.gemspec"
  system "gem", "install", "--ignore-dependencies", "travis-#{version}.gem"
  bin.install libexec/"bin/travis"
- (libexec/"gems/travis-#{version}/assets/notifications/Travis CI.app").rmtree
+ rm_r(libexec/"gems/travis-#{version}/assets/notifications/Travis CI.app")
  bin.env_script_all_files(libexec/"bin", GEM_HOME: ENV["GEM_HOME"])
  end