From a6fead6451852a96b8c5165f04a9d918935d0f30 Mon Sep 17 00:00:00 2001 From: Scott Ringwelski Date: Thu, 24 Apr 2014 21:24:37 -0400 Subject: [PATCH] undo ruby version change and undo comments --- .ruby-version | 2 +- lib/codesake/dawn/core.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ruby-version b/.ruby-version index 3e3c2f1e..227cea21 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.1.1 +2.0.0 diff --git a/lib/codesake/dawn/core.rb b/lib/codesake/dawn/core.rb index 6e66abdb..18b5fce9 100644 --- a/lib/codesake/dawn/core.rb +++ b/lib/codesake/dawn/core.rb @@ -118,12 +118,12 @@ def self.find_conf(create_if_none = false) '~/', '/usr/local/etc/', ] - # path_order.each do |p| - # fn = p + conf_name if p.start_with?('/') - # # if outside $HOME the config file must be hidden - # fn = File.expand_path(p) + '/.'+conf_name if ! p.start_with?('/') - # return fn if File.exist?(fn) - # end + path_order.each do |p| + fn = p + conf_name if p.start_with?('/') + # if outside $HOME the config file must be hidden + fn = File.expand_path(p) + '/.'+conf_name if ! p.start_with?('/') + return fn if File.exist?(fn) + end # Codesake::Dawn didn't find a config file. # If create_if_none flag is set to false, than I'll return nil so the