From 1ac470fe7a939c628f8e532e313ae06a11aeca4a Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Thu, 30 Jul 2020 09:30:44 -0400 Subject: [PATCH 1/2] bump-revision: handle array of licenses Allowing multiple licenses meant that `formula.license` returned an array. This converts that array to the appropriate format for `bump-revision` --- Library/Homebrew/dev-cmd/bump-revision.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/bump-revision.rb b/Library/Homebrew/dev-cmd/bump-revision.rb index 0575cfa4a8..cbede3d01b 100644 --- a/Library/Homebrew/dev-cmd/bump-revision.rb +++ b/Library/Homebrew/dev-cmd/bump-revision.rb @@ -42,9 +42,14 @@ module Homebrew end old = if formula.license + license_string = if formula.license.length > 1 + formula.license + else + "\"#{formula.license.first}\"" + end # insert replacement revision after license <<~EOS - license "#{formula.license}" + license #{license_string} EOS elsif formula.path.read.include?("stable do\n") # insert replacement revision after homepage From bdc8438f7ca8cd347a6ed9a59b7d28974b040117 Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Thu, 30 Jul 2020 09:32:29 -0400 Subject: [PATCH 2/2] bump-revision: update revision syntax --- Library/Homebrew/dev-cmd/bump-revision.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/bump-revision.rb b/Library/Homebrew/dev-cmd/bump-revision.rb index cbede3d01b..9a14d661a5 100644 --- a/Library/Homebrew/dev-cmd/bump-revision.rb +++ b/Library/Homebrew/dev-cmd/bump-revision.rb @@ -64,7 +64,7 @@ module Homebrew else # insert replacement revision after :revision <<~EOS - :revision => "#{formula_spec.specs[:revision]}" + revision: "#{formula_spec.specs[:revision]}" EOS end replacement = old + " revision 1\n"