standardize config file location (#2)

README.md

@@ -33,7 +33,9 @@ Alternatively, you can just point the gdcl.rb script at any folder containing _u
 #### gdcl.rb
 The script for actually searching through the dictionary is called **gdcl.rb**.
 
-There are a number of configuration options available in the `config.yml` file. By default, this file should be installed in the standard config folder under the user's home directory (i.e., in the folder `~/.config/gdcl`). If gdcl can't find the file `config.yml` in that folder, it will look for it in the current working directory (i.e., wherever you have called the script from).
+There are a number of configuration options available in the `config.yml` file. By default, this file should be installed in the standard config folder under the user's home directory (i.e., in the folder `~/.config/gdcl`). If gdcl can't find the file `config.yml` in that folder, it will look for it in $XDG_CONFIG_DIRS (i.e., `/etc/xdg/gdcl`), and failing that, the script folder (i.e., the same directory as the script executable).
+
+If you have a copy of `config.yml` in your xdg config directory or somewhere else (e.g., if you installed gdcl through a package manager), you should avoid editing that file as it will be overwritten when upgrading the package. Instead, you should make changes to a separate configuration file in your home directory (`~/.config/gdcl/config.yml`) which will take precedence over files in other locations. The `~/.config/gdcl` folder and default `config.yml` file will be created if they do not already exist when you first run gdcl.
 
 The options available in config.yml are commented and should be self-explanatory. They are listed below for reference:
 

config.yml

@@ -47,6 +47,6 @@
 
 # dsl markup options
 # remove markup (i.e. all text between "[]" tags); default is to remove markup
-:markup: /\[.*?\]/      # remove dsl markup
+:markup: '\[.*?\]'      # remove dsl markup
 # :markup: ""   # example: uncomment to allow dsl markup in entries
-:markup_replace: = ""
+:markup_replace: ""

gdcl.rb

@@ -11,14 +11,23 @@
 ########################
 
 require 'yaml'
+require 'fileutils'
 
 config_dir = Dir.home + "/.config/gdcl/"
+xdg = "/etc/xdg/gdcl/"
+script_dir = File.expand_path(File.dirname(__FILE__)) + "/"
 
 # read config file from default directory or cwd, otherwise quit
 if File.exist?(config_dir + "config.yml")
   config = YAML::load(File.read(config_dir + "config.yml"))
-elsif File.exist?("config.yml")
-  config = YAML::load(File.read("config.yml"))
+elsif File.exist?(xdg + "config.yml")
+  config = YAML::load(File.read(xdg + "config.yml"))
+  FileUtils.mkdir_p config_dir
+  FileUtils.cp xdg + "config.yml", config_dir
+elsif File.exist?(script_dir + "config.yml")
+  config = YAML::load(File.read(script_dir + "config.yml"))
+  FileUtils.mkdir_p config_dir
+  FileUtils.cp script_dir + "config.yml", config_dir
 else
   abort("        No configuration file found. Please make sure config.yml is located
         either in the config folder under your home directory (i.e.,
@@ -35,7 +44,7 @@
 temp_dir = config[:temp_dir].gsub(/^~/, Dir.home)
 search_term = config[:search_term]
 del_dict = config[:del_dict]
-markup = config[:markup]
+markup = /#{config[:markup]}/
 markup_replace = config[:markup_replace]