Library/Homebrew/cmd/shellenv.sh

@@ -50,7 +50,7 @@ homebrew-shellenv() {
       echo "setenv HOMEBREW_REPOSITORY ${HOMEBREW_REPOSITORY};"
       if [[ -n "${PATH_HELPER_ROOT}" ]]
       then
-        echo "eval \`PATH_HELPER_ROOT=\"${PATH_HELPER_ROOT}\" /usr/libexec/path_helper -c\`;"
+        PATH_HELPER_ROOT="${PATH_HELPER_ROOT}" PATH="${HOMEBREW_PATH}" /usr/libexec/path_helper -c
       else
         echo "setenv PATH ${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin:\$PATH;"
       fi
@@ -75,7 +75,7 @@ homebrew-shellenv() {
       fi
       if [[ -n "${PATH_HELPER_ROOT}" ]]
       then
-        echo "eval \"\$(PATH_HELPER_ROOT=\"${PATH_HELPER_ROOT}\" /usr/libexec/path_helper -s)\""
+        PATH_HELPER_ROOT="${PATH_HELPER_ROOT}" PATH="${HOMEBREW_PATH}" /usr/libexec/path_helper -s
       else
         echo "export PATH=\"${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin\${PATH+:\$PATH}\";"
       fi

Library/Homebrew/cmd/update-report.rb

@@ -974,11 +974,7 @@ class ReporterHub
       # Skip non-homebrew/core formulae for security.
       return if formula.include?("/")
 
-      begin
-        Formula[formula].desc&.presence
-      rescue FormulaUnavailableError
-        nil
-      end
+      Formula[formula].desc&.presence
     else
       all_formula_json.find { |f| f["name"] == formula }
                       &.fetch("desc", nil)
@@ -992,11 +988,7 @@ class ReporterHub
       # Skip non-homebrew/cask formulae for security.
       return if cask.include?("/")
 
-      begin
-        Cask::CaskLoader.load(cask).desc&.presence
-      rescue Cask::CaskError
-        nil
-      end
+      Cask::CaskLoader.load(cask).desc&.presence
     else
       all_cask_json.find { |f| f["token"] == cask }
                    &.fetch("desc", nil)