Merge pull request #179416 from Homebrew/i-bin-audit-followup

i*: Stop interpolating `bin`

Formula/i/i686-elf-binutils.rb

@@ -52,7 +52,8 @@ def install
           movl $4, %ebx
           int $0x80
     EOS
-    system "#{bin}/i686-elf-as", "--32", "-o", "test-s.o", "test-s.s"
+
+    system bin/"i686-elf-as", "--32", "-o", "test-s.o", "test-s.s"
     assert_match "file format elf32-i386",
       shell_output("#{bin}/i686-elf-objdump -a test-s.o")
   end

Formula/i/icdiff.rb

@@ -23,8 +23,9 @@ def install
   test do
     (testpath/"file1").write "test1"
     (testpath/"file2").write "test1"
+
     system bin/"icdiff", "file1", "file2"
     system "git", "init"
-    system "#{bin}/git-icdiff"
+    system bin/"git-icdiff"
   end
 end

Formula/i/icu4c.rb

@@ -43,10 +43,10 @@ def install
 
   test do
     if File.exist? "/usr/share/dict/words"
-      system "#{bin}/gendict", "--uchars", "/usr/share/dict/words", "dict"
+      system bin/"gendict", "--uchars", "/usr/share/dict/words", "dict"
     else
       (testpath/"hello").write "hello\nworld\n"
-      system "#{bin}/gendict", "--uchars", "hello", "dict"
+      system bin/"gendict", "--uchars", "hello", "dict"
     end
   end
 end

Formula/i/id3tool.rb

@@ -36,11 +36,12 @@ def install
   end
 
   test do
-    mp3 = "#{testpath}/test.mp3"
-    cp test_fixtures("test.mp3"), mp3
+    test_mp3 = testpath/"test.mp3"
+    # needs to write the file to set the tags
+    cp test_fixtures("test.mp3"), test_mp3
 
-    system bin/"id3tool", "-t", "Homebrew", mp3
+    system bin/"id3tool", "-t", "Homebrew", test_mp3
     assert_match(/Song Title:\s+Homebrew/,
-                 shell_output("#{bin}/id3tool #{mp3}").chomp)
+                 shell_output("#{bin}/id3tool #{test_mp3}").chomp)
   end
 end

Formula/i/ideviceinstaller.rb

@@ -34,6 +34,6 @@ def install
   end
 
   test do
-    system "#{bin}/ideviceinstaller --help |grep -q ^Usage"
+    assert_match "Manage apps on iOS devices", shell_output("#{bin}/ideviceinstaller --help")
   end
 end

Formula/i/imessage-ruby.rb

@@ -33,10 +33,6 @@ def install
   end
 
   test do
-    if build.head?
-      system "#{bin}/imessage", "--version"
-    else
-      assert_match "imessage v#{version}", shell_output("#{bin}/imessage --version")
-    end
+    assert_match "imessage v#{version}", shell_output("#{bin}/imessage --version")
   end
 end

Formula/i/imlib2.rb

@@ -44,6 +44,6 @@ def install
   end
 
   test do
-    system "#{bin}/imlib2_conv", test_fixtures("test.png"), "imlib2_test.png"
+    system bin/"imlib2_conv", test_fixtures("test.png"), "imlib2_test.png"
   end
 end

Formula/i/influxdb-cli.rb

@@ -60,7 +60,7 @@ def install
     assert_match "OK", shell_output("#{bin}/influx ping")
 
     # Perform initial DB setup.
-    system "#{bin}/influx", "setup", "-u", "usr", "-p", "fakepassword", "-b", "bkt", "-o", "org", "-f"
+    system bin/"influx", "setup", "-u", "usr", "-p", "fakepassword", "-b", "bkt", "-o", "org", "-f"
 
     # Assert that initial resources show in CLI output.
     assert_match "usr", shell_output("#{bin}/influx user list")

Formula/i/inform6.rb

@@ -22,20 +22,20 @@ class Inform6 < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "ef7742bbf2854576904ccb28655b7af1fea66086ce33e305f6bc946510038b12"
   end
 
-  resource "homebrew-test_resource" do
-    url "https://inform-fiction.org/examples/Adventureland/Adventureland.inf"
-    sha256 "3961388ff00b5dfd1ccc1bb0d2a5c01a44af99bdcf763868979fa43ba3393ae7"
-  end
-
   def install
     # Parallel install fails because of: https://gitlab.com/DavidGriffith/inform6unix/-/issues/26
     ENV.deparallelize
     system "make", "PREFIX=#{prefix}", "MAN_PREFIX=#{man}", "MANDIR=#{man1}", "install"
   end
 
   test do
+    resource "homebrew-test_resource" do
+      url "https://inform-fiction.org/examples/Adventureland/Adventureland.inf"
+      sha256 "3961388ff00b5dfd1ccc1bb0d2a5c01a44af99bdcf763868979fa43ba3393ae7"
+    end
+
     resource("homebrew-test_resource").stage do
-      system "#{bin}/inform", "Adventureland.inf"
+      system bin/"inform", "Adventureland.inf"
       assert_predicate Pathname.pwd/"Adventureland.z5", :exist?
     end
   end

Formula/i/ipv6toolkit.rb

@@ -34,6 +34,6 @@ def install
   end
 
   test do
-    system "#{bin}/addr6", "-a", "fc00::1"
+    system bin/"addr6", "-a", "fc00::1"
   end
 end

Formula/i/ircd-hybrid.rb

@@ -56,6 +56,6 @@ def caveats
   end
 
   test do
-    system "#{bin}/ircd", "-version"
+    system bin/"ircd", "-version"
   end
 end

Formula/i/irrtoolset.rb

@@ -46,6 +46,6 @@ def install
   end
 
   test do
-    system "#{bin}/peval", "ANY"
+    system bin/"peval", "ANY"
   end
 end

Formula/i/ivtools.rb

@@ -42,6 +42,6 @@ def install
   end
 
   test do
-    system "#{bin}/comterp", "exit(0)"
+    system bin/"comterp", "exit(0)"
   end
 end