Add config file as cli option (#576)

* Parse cli arguments before configuration file

Parsing the cli arguments before the configuration file allows `--help`
and `--version` to be used even if the configuration file is broken.

* Add configuration file to command line arguments

This commit adds a new command line flag `--config-file` to override the default
configuration file location. If the specified file is unavailable,
Alacritty will quit instead of generating a fallback. If the specified
file is invalid, i.e. /dev/null, the compiled in defaults will be loaded
instead.

1 files changed, 16 insertions, 1 deletions

diff --git a/src/cli.rs b/src/cli.rs
index 4a455cf4..e7783807 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -15,7 +15,8 @@ extern crate log;
 use clap::{Arg, App};
 use index::{Line, Column};
 use config::{Dimensions, Shell};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
+use std::borrow::Cow;
 
 const DEFAULT_TITLE: &'static str = "Alacritty";
 
@@ -28,6 +29,7 @@ pub struct Options {
     pub log_level: log::LogLevelFilter,
     pub command: Option<Shell<'static>>,
     pub working_dir: Option<PathBuf>,
+    pub config: Option<PathBuf>,
 }
 
 impl Default for Options {
@@ -40,6 +42,7 @@ impl Default for Options {
             log_level: log::LogLevelFilter::Warn,
             command: None,
             working_dir: None,
+            config: None,
         }
     }
 }
@@ -82,6 +85,10 @@ impl Options {
                  .long("working-directory")
                  .takes_value(true)
                  .help("Start the shell in the specified working directory"))
+            .arg(Arg::with_name("config-file")
+                 .long("config-file")
+                 .takes_value(true)
+                 .help("Specify alternative configuration file [default: $XDG_CONFIG_HOME/alacritty/alacritty.yml]"))
             .arg(Arg::with_name("command")
                 .short("e")
                 .multiple(true)
@@ -128,6 +135,10 @@ impl Options {
             options.working_dir = Some(PathBuf::from(dir.to_string()));
         }
 
+        if let Some(path) = matches.value_of("config-file") {
+            options.config = Some(PathBuf::from(path.to_string()));
+        }
+
         if let Some(mut args) = matches.values_of("command") {
             // The following unwrap is guaranteed to succeed.
             // If 'command' exists it must also have a first item since
@@ -147,4 +158,8 @@ impl Options {
     pub fn command(&self) -> Option<&Shell> {
         self.command.as_ref()
     }
+
+    pub fn config_path(&self) -> Option<Cow<Path>> {
+        self.config.as_ref().map(|p| Cow::Borrowed(p.as_path()))
+    }
 }