From de4f5c1095f15a87eda0b7bf755e8c86e9e7a47b Mon Sep 17 00:00:00 2001
From: William Ma <whoiswillma@gmail.com>
Date: Wed, 22 Jul 2020 22:45:47 -0400
Subject: [PATCH] commands: Fix code review comments

---
 Library/Homebrew/cmd/commands.rb | 22 +++++++++++-----------
 Library/Homebrew/commands.rb     |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Library/Homebrew/cmd/commands.rb b/Library/Homebrew/cmd/commands.rb
index 877dd59d36..999288569f 100644
--- a/Library/Homebrew/cmd/commands.rb
+++ b/Library/Homebrew/cmd/commands.rb
@@ -31,17 +31,17 @@ module Homebrew
       return
     end
 
-    [["Built-in commands", -> { Commands.internal_commands }],
-     ["Built-in developer commands", -> { Commands.internal_developer_commands }],
-     ["External commands", -> { Commands.external_commands }],
-     ["Cask commands", -> { Commands.cask_internal_commands }],
-     ["External cask commands", -> { Commands.cask_external_commands }]]
-      .each_with_index do |title_and_proc, index|
-      title, proc = title_and_proc
-      cmds = proc.call
-      if cmds.present?
-        puts unless index.zero?
-        ohai title, Formatter.columns(cmds)
+    first = true
+
+    [["Built-in commands", Commands.internal_commands],
+     ["Built-in developer commands", Commands.internal_developer_commands],
+     ["External commands", Commands.external_commands],
+     ["Cask commands", Commands.cask_internal_commands],
+     ["External cask commands", Commands.cask_external_commands]]
+      .each do |title, commands|
+      if commands.present?
+        first = !first && puts
+        ohai title, Formatter.columns(commands)
       end
     end
   end
diff --git a/Library/Homebrew/commands.rb b/Library/Homebrew/commands.rb
index 1da8946be4..d68feffe5b 100644
--- a/Library/Homebrew/commands.rb
+++ b/Library/Homebrew/commands.rb
@@ -155,10 +155,10 @@ module Commands
   def cask_external_commands
     PATH.new(Tap.cmd_directories, ENV["HOMEBREW_PATH"]).flat_map do |search_path|
       find_commands(search_path).map do |possible_command|
-        p = possible_command.to_path
-        command_name = p.match(/brewcask-(.*)\.rb/) { |data| data[1].delete_suffix(".rb") }
+        path = possible_command.to_path
+        command_name = path.match(/brewcask-(.*)\.rb/) { |data| data[1].delete_suffix(".rb") }
         if command_name.blank? && possible_command.executable?
-          command_name = p.match(/brewcask-(.*)/) { |data| data[1] }
+          command_name = path.match(/brewcask-(.*)/) { |data| data[1] }
         end
         command_name
       end.compact