From 0c8f977665ad702482ee400c9df135aab1f2fe10 Mon Sep 17 00:00:00 2001 From: Elizabeth Tackett Date: Wed, 1 Jul 2020 11:44:56 -0500 Subject: [PATCH] update the way popen_read responses are parsed --- Library/Homebrew/utils/livecheck.rb | 2 +- Library/Homebrew/utils/versions.rb | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Library/Homebrew/utils/livecheck.rb b/Library/Homebrew/utils/livecheck.rb index 914880e13c..07c7acdaa6 100644 --- a/Library/Homebrew/utils/livecheck.rb +++ b/Library/Homebrew/utils/livecheck.rb @@ -9,7 +9,7 @@ module Livecheck end def parse_livecheck_response(response) - output = response.first.delete(" ").split(/:|==>|\n/) + output = response.delete(" ").split(/:|==>/) # eg: ["burp", "2.2.18", "2.2.18"] package_name, brew_version, latest_version = output diff --git a/Library/Homebrew/utils/versions.rb b/Library/Homebrew/utils/versions.rb index de5de6d239..f688a5b8c7 100644 --- a/Library/Homebrew/utils/versions.rb +++ b/Library/Homebrew/utils/versions.rb @@ -8,15 +8,8 @@ module Versions end def bump_formula_pr(formula_name, url) - response = Utils.popen_read("brew", "bump-formula-pr", "--no-browse", - "--dry-run", formula_name, "--url=#{url}").chomp - - parse_formula_bump_response(response) - end - - def parse_formula_bump_response(formula_bump_response) - response, _status = formula_bump_response - response + Utils.popen_read("brew", "bump-formula-pr", "--no-browse", "--dry-run", + formula_name, "--url=#{url}").chomp end def check_for_open_pr(formula_name, download_url)