diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-04-08 13:48:43 +0200 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-04-08 13:48:43 +0200 |
| commit | a5a7a524981005c63931b62567ffca355965b2ba (patch) | |
| tree | dff700746c4fb9d14b024439ef74588f06a8f5e2 /mumctl/src/main.rs | |
| parent | a13d4b7d10aff81823b8cabf1d72daa881d36065 (diff) | |
| download | mum-a5a7a524981005c63931b62567ffca355965b2ba.tar.gz | |
remove cfg_exists, pass paths explicitly
Diffstat (limited to 'mumctl/src/main.rs')
| -rw-r--r-- | mumctl/src/main.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 29c9e44..0fe852c 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -207,7 +207,7 @@ fn main() { } } fn match_opt() -> Result<(), Error> { - let mut config = config::read_default_cfg()?; + let mut config = config::read_cfg(&config::default_cfg_path())?; let opt = Mum::from_args(); match opt.command { @@ -347,18 +347,19 @@ fn match_opt() -> Result<(), Error> { } } - if !config::cfg_exists() { + let config_path = config::default_cfg_path(); + if !config_path.exists() { println!( "Config file not found. Create one in {}? [Y/n]", - config::default_cfg_path().display(), + config_path.display(), ); let stdin = std::io::stdin(); let response = stdin.lock().lines().next(); if let Some(Ok(true)) = response.map(|e| e.map(|e| &e == "Y")) { - config.write_default_cfg(true)?; + config.write(&config_path, true)?; } } else { - config.write_default_cfg(false)?; + config.write(&config_path, false)?; } Ok(()) } |
