Merge pull request #3 from orlando/master

[rbdr/lyricli.rb] / lib / lyricli / configuration.rb

diff --git a/lib/lyricli/configuration.rb b/lib/lyricli/configuration.rb
index 720070ced8181acaa438851a009429e927dbc6a3..b90e772b1fa3bfc04ccae56ee8cc2a1b8b366b29 100644 (file)
--- a/lib/lyricli/configuration.rb
+++ b/lib/lyricli/configuration.rb
@@ -56,7 +56,7 @@ module Lyricli
     def load_config
       path = File.expand_path(@config_path)
 
     def load_config
       path = File.expand_path(@config_path)
 

-      if File.exists?(path)
+      if File.exist?(path)

         file = File.new(path, "r")
         @config = MultiJson.decode(file.read)
       else
         file = File.new(path, "r")
         @config = MultiJson.decode(file.read)
       else


@@ -77,8 +77,7 @@ module Lyricli
     # Loads the default configuration from a JSON file
     def load_default_config
       # Load the default
     # Loads the default configuration from a JSON file
     def load_default_config
       # Load the default

-      path_root = File.expand_path(File.dirname(__FILE__))
-      path = File.join(path_root, @defaults_path)
+      path = File.join(::Lyricli.root, "config", @defaults_path)

 
       if File.exists?(path)
         file = File.new(path, "r")
 
       if File.exists?(path)
         file = File.new(path, "r")