From a5a7a524981005c63931b62567ffca355965b2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Thu, 8 Apr 2021 13:48:43 +0200
Subject: remove cfg_exists, pass paths explicitly

---
 mumctl/src/main.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'mumctl/src/main.rs')

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(())
 }
-- 
cgit v1.2.1