v1.0.1 Release

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "steeloxide"
-version = "1.0.0"
+version = "1.0.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/freebsd/revive.rs

@@ -138,22 +138,16 @@ pub fn main(cmd: &ArgMatches) -> Result<(), Box<dyn std::error::Error>> {
     let file_path = cmd.get_one::<String>("config").unwrap_or(&default_path);
     let file = File::open(&file_path)?;
     let reader = BufReader::new(file);
-    let config: PfConfig = match reader.map(|r| serde_json::from_reader(r)) {
-        Ok(x) => match x {
-            Ok(y) => y,
-            Err(_) => {
-                error!("Could not setup config! Moving to setup...");
-                return Ok(setup::main().unwrap());
-            }
-        },
+    let config: PfConfig = match serde_json::from_reader(reader) {
+        Ok(x) => x,
         Err(_) => {
             error!("Could not setup config! Moving to setup...");
-            return Ok(setup::main().unwrap());
+            return setup::main();
         }
     };
     if !verify_config((&file_path).to_string()) {
         warn!("Config found to be invalid! Moving to setup...");
-        return setup::main().unwrap();
+        return setup::main();
     }
     check_firewall(&config);
     audit_users(&config);

src/linux/revive.rs

@@ -227,17 +227,17 @@ pub fn main(cmd: &ArgMatches) -> Result<(), Box<dyn std::error::Error>> {
             Ok(y) => y,
             Err(_) => {
                 error!("Could not setup config! Moving to setup...");
-                return Ok(setup::main().unwrap());
+                return setup::main();
             }
         },
         Err(_) => {
             error!("Could not setup config! Moving to setup...");
-            return Ok(setup::main().unwrap());
+            return setup::main();
         }
     };
     if !verify_config((&file_path).to_string()) {
         warn!("Config found to be invalid! Moving to setup...");
-        return Ok(setup::main().unwrap());
+        return setup::main();
     }
     check_firewall(&config);
     audit_users(&config);

src/windows/revive.rs

@@ -366,22 +366,16 @@ pub fn main(cmd: &ArgMatches) -> Result<(), Box<dyn std::error::Error>> {
     let file_path = cmd.get_one::<String>("config").unwrap_or(&default_path);
     let file = File::open(&file_path)?;
     let reader = BufReader::new(file);
-    let config: SysConfig = match reader.map(|r| serde_json::from_reader(r)) {
-        Ok(x) => match x {
-            Ok(y) => y,
-            Err(_) => {
-                error!("Could not setup config! Moving to setup...");
-                return Ok(setup::main().unwrap());
-            }
-        },
+    let config: SysConfig = match serde_json::from_reader(reader) {
+        Ok(x) => x,
         Err(_) => {
             error!("Could not setup config! Moving to setup...");
-            return Ok(setup::main().unwrap());
+            return setup::main();
         }
     };
     if !verify_config((&file_path).to_string()) {
         warn!("Config found to be invalid! Moving to setup...");
-        return setup::main().unwrap();
+        return setup::main();
     }
     check_firewall(&config);
     //let password = prompt_password("Enter password for valid users: ").unwrap();