X-Git-Url: https://git.r.bdr.sh/rbdr/lyricli.rb/blobdiff_plain/34d0bf15a6f4009de376ceed1d7d5cca24a8dfe7..b2ac68932fa671151d3ab3115c565fa9ad06420c:/lib/lyricli/configuration.rb?ds=inline diff --git a/lib/lyricli/configuration.rb b/lib/lyricli/configuration.rb index 720070c..53a3e2b 100644 --- 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) - if File.exists?(path) + if File.exist?(path) file = File.new(path, "r") @config = MultiJson.decode(file.read) else @@ -77,10 +77,9 @@ module Lyricli # 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) + if File.exist?(path) file = File.new(path, "r") @config = MultiJson.decode(file.read) else