fix: change default Linux config dir to etc (Closes #5)

Author: mincomk

build.rs

@@ -1,4 +1,4 @@
-#[cfg(all(target_os = "windows"))]
+#[cfg(target_os = "windows")]
 fn main() {
     let mut res = winres::WindowsResource::new();
     res.set_manifest(include_str!("app.manifest"));

src/bin/it.rs

@@ -4,12 +4,6 @@ use std::process::Command;
 fn main() {
     let args: Vec<String> = env::args().skip(1).collect();
 
-    // do bootit scan and print result
-    Command::new("bootit")
-        .arg("scan")
-        .status()
-        .expect("Failed to execute 'bootit scan' command. Make sure 'bootit' is installed and in your PATH.");
-
     let status = match Command::new("bootit").arg("boot").args(&args).status() {
         Ok(status) => status,
         Err(e) => {

src/command/boot.rs

@@ -33,7 +33,7 @@ pub fn boot(config_path: PathBuf, target: String, no_reboot: bool) -> miette::Re
             println!("Resolving alias '{}'", alias);
             let config = config::open_config(config_path)?;
 
-            if let Some(ref alias) = config.find_alias(&alias) {
+            if let Some(alias) = config.find_alias(&alias) {
                 let entry = efi::find_boot_entry_by_identifier(&system, &alias.identifier)?
                     .ok_or_else(|| miette!("Boot entry not found"))?;
                 println!(

src/config.rs

@@ -15,12 +15,7 @@ pub struct ConfigHandle {
 
 impl ConfigHandle {
     pub fn find_alias<'a>(&'a self, name: &str) -> Option<&'a crate::BootAlias> {
-        for alias in &self.config.aliases {
-            if alias.name == name {
-                return Some(alias);
-            }
-        }
-        None
+        self.config.aliases.iter().find(|&alias| alias.name == name).map(|v| v as _)
     }
 
     pub fn aliases(&self) -> &Vec<crate::BootAlias> {
@@ -104,7 +99,7 @@ fn load_config(path: impl AsRef<Path>) -> miette::Result<Config> {
         Err(_) => {
             let default_config = Config::default();
             save_config(&path, &default_config)?;
-            return Ok(default_config);
+            Ok(default_config)
         }
     }
 }
@@ -128,7 +123,7 @@ pub fn determine_config_path(path: Option<PathBuf>) -> miette::Result<PathBuf> {
 }
 
 fn default_config_path() -> PathBuf {
-    // HEURISTIC: BOOTIT_CONFIG_PATH, $HOME/.config/bootit.yaml,
+    // HEURISTIC: BOOTIT_CONFIG_PATH, /etc/bootit.yaml,
     // C:\ProgramData\bootit\config.yaml
 
     if let Ok(env_path) = std::env::var("BOOTIT_CONFIG_PATH") {
@@ -138,10 +133,8 @@ fn default_config_path() -> PathBuf {
     if cfg!(target_os = "windows") {
         let program_data =
             std::env::var("PROGRAMDATA").unwrap_or_else(|_| "C:\\ProgramData".to_string());
-        return PathBuf::from(format!("{}\\bootit\\config.yaml", program_data));
+        PathBuf::from(format!("{}\\bootit\\config.yaml", program_data))
     } else {
-        // using HOME, to support SETUID
-        let home_env = std::env::var("HOME").unwrap_or_else(|_| ".".to_string());
-        return PathBuf::from(format!("{}/.config/bootit.yaml", home_env));
+        PathBuf::from("/etc/bootit.yaml".to_string())
     }
 }

src/util.rs

@@ -62,8 +62,8 @@ fn is_elevated() -> bool {
 #[allow(unused)]
 pub fn find_it() -> miette::Result<PathBuf> {
     if let Ok(path) = which("it") {
-        return Ok(path);
+        Ok(path)
     } else {
-        return Err(miette!("Could not find 'it' in PATH. Please install it."));
+        Err(miette!("Could not find 'it' in PATH. Please install it."))
     }
 }