Merge branch 'master' of github.com:benbeltran/lyricli

diff --git a/bin/lrc b/bin/lrc
index b1a44b625e45d182bdb8e1a020d34178e7775ff3..3f71d87cc35212ea49a870c0f66d041d123b8503 100755 (executable)
--- a/bin/lrc
+++ b/bin/lrc
@@ -3,8 +3,6 @@
 require 'optparse'
 require 'lyricli'
 
-
-options = {}
 OptionParser.new do |opts|
     opts.banner = %{Usage:
     lrc [options]

diff --git a/lib/lyricli/configuration.rb b/lib/lyricli/configuration.rb
index 811526b5d06b62491106b00e6c1f46d01ec80fd3..53a3e2bb9566b6c8b533330d18af0990dc0bccbb 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)
 
-      if File.exists?(path)
+      if File.exist?(path)
         file = File.new(path, "r")
         @config = MultiJson.decode(file.read)
       else
@@ -79,7 +79,7 @@ module Lyricli
       # Load the default
       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