From 5cb392d9d7cf05022be5f3eac121cffb1fe7b097 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Thu, 28 May 2015 23:57:02 -0400
Subject: [PATCH] Revert "Check empty? to avoid introducing nils"

This reverts commit 580cd173cbf92aa9851e68d635af518a668a6cdc.
---
 Library/Homebrew/cmd/bottle.rb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb
index 9c01c968f1..ba397c59e9 100644
--- a/Library/Homebrew/cmd/bottle.rb
+++ b/Library/Homebrew/cmd/bottle.rb
@@ -125,17 +125,14 @@ module Homebrew
       return ofail "Formula has no stable version: #{f.name}"
     end
 
-    bottle_revision = 0
-
-    unless ARGV.include? "--no-revision"
+    if ARGV.include? '--no-revision'
+      bottle_revision = 0
+    else
       ohai "Determining #{f.name} bottle revision..."
       versions = FormulaVersions.new(f)
       bottle_revisions = versions.bottle_version_map("origin/master")[f.pkg_version]
-
-      unless bottle_revisions.empty?
-        bottle_revisions.pop if bottle_revisions.last > 0
-        bottle_revision = bottle_revisions.max + 1
-      end
+      bottle_revisions.pop if bottle_revisions.last.to_i > 0
+      bottle_revision = bottle_revisions.any? ? bottle_revisions.max.to_i + 1 : 0
     end
 
     filename = Bottle::Filename.create(f, bottle_tag, bottle_revision)