From 5b31507fdac6ae12141b3e84f70115610a7ae00c Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Sat, 1 Oct 2016 12:13:09 +0100
Subject: Use Library/.rubocop.yml file.

This allows having a shared style that’s use for Homebrew/brew and taps
which can be overridden by Homebrew/brew.
---
 Library/Homebrew/.rubocop.yml | 2 +-
 Library/Homebrew/cmd/style.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Library/Homebrew')

diff --git a/Library/Homebrew/.rubocop.yml b/Library/Homebrew/.rubocop.yml
index 0b5d67521..f4f80800a 100644
--- a/Library/Homebrew/.rubocop.yml
+++ b/Library/Homebrew/.rubocop.yml
@@ -1,5 +1,5 @@
 inherit_from:
-  - ../.rubocop_common.yml
+  - ../.rubocop.yml
   - .rubocop_todo.yml
 
 AllCops:
diff --git a/Library/Homebrew/cmd/style.rb b/Library/Homebrew/cmd/style.rb
index e44641f70..9934c6939 100644
--- a/Library/Homebrew/cmd/style.rb
+++ b/Library/Homebrew/cmd/style.rb
@@ -56,7 +56,7 @@ module Homebrew
       args << "--config" << HOMEBREW_LIBRARY_PATH/".rubocop.yml"
       args += [HOMEBREW_LIBRARY_PATH]
     else
-      args << "--config" << Tap::TAP_DIRECTORY/".rubocop.yml"
+      args << "--config" << HOMEBREW_LIBRARY/".rubocop.yml"
       args << "--format" << "simple"
       args += files
     end
-- 
cgit v1.2.3