aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Contributions/cmd
diff options
context:
space:
mode:
authorJack Nagel2014-07-05 19:13:43 -0500
committerJack Nagel2014-07-05 19:16:14 -0500
commit408d8440046bcdb96fbd05e4f53edceb044c5a4d (patch)
tree3f6256b3cb9605187924d557ee22ede2f57febbb /Library/Contributions/cmd
parent8c0e6f9bb26397ff4a9a1d5b192527d5a4660f97 (diff)
downloadhomebrew-408d8440046bcdb96fbd05e4f53edceb044c5a4d.tar.bz2
brew-pull: combine conditionals
Diffstat (limited to 'Library/Contributions/cmd')
-rwxr-xr-xLibrary/Contributions/cmd/brew-pull.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Contributions/cmd/brew-pull.rb b/Library/Contributions/cmd/brew-pull.rb
index c7d9d02cf..fd6c3fa7c 100755
--- a/Library/Contributions/cmd/brew-pull.rb
+++ b/Library/Contributions/cmd/brew-pull.rb
@@ -20,6 +20,7 @@ end
ARGV.named.each do |arg|
if arg.to_i > 0
url = 'https://github.com/Homebrew/homebrew/pull/' + arg
+ issue = arg
else
url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX
unless url_match
@@ -28,6 +29,7 @@ ARGV.named.each do |arg|
end
url = url_match[0]
+ issue = url_match[4]
end
if tap_name = tap(url)
@@ -39,8 +41,6 @@ ARGV.named.each do |arg|
Dir.chdir HOMEBREW_REPOSITORY
end
- issue = arg.to_i > 0 ? arg.to_i : url_match[4]
-
if ARGV.include? '--bottle'
raise 'No pull request detected!' unless issue
url = "https://github.com/BrewTestBot/homebrew/compare/homebrew:master...pr-#{issue}"