From 3b366d05b9c8a29a89bbf773fd2557024ea977b1 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Fri, 11 Dec 2020 16:24:49 +0100
Subject: [PATCH] Fix code style.

---
 Library/Homebrew/cask/dsl.rb            |  2 +-
 Library/Homebrew/dev-cmd/livecheck.rb   | 12 ++++-----
 Library/Homebrew/livecheck/livecheck.rb | 34 ++++++++++++-------------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Library/Homebrew/cask/dsl.rb b/Library/Homebrew/cask/dsl.rb
index 7af922f50d..6255265ffa 100644
--- a/Library/Homebrew/cask/dsl.rb
+++ b/Library/Homebrew/cask/dsl.rb
@@ -278,7 +278,7 @@ module Cask
 
     def livecheck(&block)
       @livecheck ||= Livecheck.new(self)
-      return @livecheck unless block_given?
+      return @livecheck unless block
 
       raise CaskInvalidError.new(cask, "'livecheck' stanza may only appear once.") if @livecheckable
 
diff --git a/Library/Homebrew/dev-cmd/livecheck.rb b/Library/Homebrew/dev-cmd/livecheck.rb
index 7049215da4..ae2919a0df 100644
--- a/Library/Homebrew/dev-cmd/livecheck.rb
+++ b/Library/Homebrew/dev-cmd/livecheck.rb
@@ -61,16 +61,16 @@ module Homebrew
 
     formulae_and_casks_to_check = if args.tap
       tap = Tap.fetch(args.tap)
-      formulae = !args.cask? ? tap.formula_names.map { |name| Formula[name] } : []
-      casks = !args.formula? ? tap.cask_tokens.map { |token| Cask::CaskLoader.load(token) } : []
+      formulae = args.cask? ? [] : tap.formula_names.map { |name| Formula[name] }
+      casks = args.formula? ? [] : tap.cask_tokens.map { |token| Cask::CaskLoader.load(token) }
       formulae + casks
     elsif args.installed?
-      formulae = !args.cask? ? Formula.installed : []
-      casks = !args.formula? ? Cask::Caskroom.casks : []
+      formulae = args.cask? ? [] : Formula.installed
+      casks = args.formula? ? [] : Cask::Caskroom.casks
       formulae + casks
     elsif args.all?
-      formulae = !args.cask? ? Formula.to_a : []
-      casks = !args.formula? ? Cask::Cask.to_a : []
+      formulae = args.cask? ? [] : Formula.to_a
+      casks = args.formula? ? [] : Cask::Cask.to_a
       formulae + casks
     elsif args.named.present?
       if args.formula?
diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb
index 737b139e4c..e96544215d 100644
--- a/Library/Homebrew/livecheck/livecheck.rb
+++ b/Library/Homebrew/livecheck/livecheck.rb
@@ -120,15 +120,15 @@ module Homebrew
           separator, method = livecheck_version
           Version.new(formula_or_cask.version.to_s.split(separator, 2).try(method))
         elsif formula
-            if formula.head_only?
-              formula.any_installed_version.version.commit
-            else
-              formula.stable.version
-            end
+          if formula.head_only?
+            formula.any_installed_version.version.commit
+          else
+            formula.stable.version
+          end
         elsif livecheck_version.is_a?(Symbol)
           Version.new(Cask::DSL::Version.new(formula_or_cask.version).try(livecheck_version))
-          else
-            Version.new(formula_or_cask.version)
+        else
+          Version.new(formula_or_cask.version)
         end
 
         latest = if formula&.stable? || cask
@@ -269,9 +269,9 @@ module Homebrew
       if formula&.deprecated? && !formula.livecheckable?
         return status_hash(formula, "deprecated", args: args) if args.json?
 
-          puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : deprecated" unless args.quiet?
-          return
-        end
+        puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : deprecated" unless args.quiet?
+        return
+      end
 
       if formula&.disabled? && !formula.livecheckable?
         return status_hash(formula, "disabled", args: args) if args.json?
@@ -283,17 +283,17 @@ module Homebrew
       if formula&.versioned_formula? && !formula.livecheckable?
         return status_hash(formula, "versioned", args: args) if args.json?
 
-          puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : versioned" unless args.quiet?
-          return
-        end
+        puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : versioned" unless args.quiet?
+        return
+      end
 
       if formula&.head_only? && !formula.any_version_installed?
         head_only_msg = "HEAD only formula must be installed to be livecheckable"
         return status_hash(formula, "error", [head_only_msg], args: args) if args.json?
 
-          puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : #{head_only_msg}" unless args.quiet?
-          return
-        end
+        puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : #{head_only_msg}" unless args.quiet?
+        return
+      end
 
       is_gist = formula&.stable&.url&.include?("gist.github.com")
       if formula_or_cask.livecheck.skip? || is_gist
@@ -312,7 +312,7 @@ module Homebrew
           puts "#{Tty.red}#{formula_or_cask_name(formula_or_cask, args: args)}#{Tty.reset} : skipped" \
               "#{" - #{skip_msg}" if skip_msg.present?}"
         end
-          return
+        return
       end
 
       false