detect with winreg instead of pathsearch

Author: adamspofford-dfinity

Cargo.lock

@@ -61,7 +61,6 @@ mockall = "0.13.1"
 notify = "8.2.0"
 p256 = { version = "0.13.2", features = ["pem", "pkcs8", "std"] }
 pathdiff = { version = "0.2.3", features = ["camino"] }
-pathsearch = "0.2.0"
 pem = "3.0.5"
 phf = { version = "0.13.1", features = ["macros"] }
 pkcs8 = { version = "0.10.2", features = ["encryption", "std"] }
@@ -86,6 +85,7 @@ tracing = "0.1.41"
 tracing-subscriber = "0.3.20"
 url = "2.5.4"
 uuid = { version = "1.16.0", features = ["serde", "v4"] }
+winreg = "0.55"
 zeroize = "1.8.1"
 
 [workspace.dependencies.reqwest]

Cargo.toml

@@ -39,7 +39,6 @@ k256 = { workspace = true }
 keyring = { workspace = true }
 notify = { workspace = true }
 p256 = { workspace = true }
-pathsearch = { workspace = true }
 pem = { workspace = true }
 pkcs8 = { workspace = true }
 rand = { workspace = true }
@@ -65,5 +64,8 @@ url = { workspace = true }
 uuid = { workspace = true }
 zeroize = { workspace = true }
 
+[target.'cfg(windows)'.dependencies]
+winreg = { workspace = true }
+
 [dev-dependencies]
 jsonschema = { workspace = true }

crates/icp/Cargo.toml

@@ -172,22 +172,24 @@ fn shell_command(s: &str, cwd: &Path) -> Result<Command, ScriptError> {
     #[cfg(unix)]
     let mut cmd = Command::new("sh");
     #[cfg(windows)]
-    let mut cmd = if let Some(_) = std::env::var_os("BASH_VERSION") {
+    let mut cmd = if let Some(_) = std::env::var_os("MSYSTEM") {
         Command::new("bash")
     } else {
-        if let Some(git_path) = pathsearch::find_executable_in_path("git") {
-            let git_path =
-                PathBuf::try_from(git_path.clone()).context(BadPathSnafu { path: git_path })?;
-            if let Some(cmd_path) = git_path.parent()
-                && cmd_path.ends_with("cmd")
-            {
-                Command::new(cmd_path.parent().unwrap().join("bin/bash.exe"))
-            } else {
-                return LocateBashSnafu { git_path }.fail();
-            }
+        use winreg::{RegKey, enums::*};
+        let git_for_windows_path = if let Ok(lm_path) = RegKey::predef(HKEY_LOCAL_MACHINE)
+            .open_subkey(r"SOFTWARE\GitForWindows")
+            .and_then(|key| key.get_value::<String, _>("InstallPath"))
+        {
+            lm_path
+        } else if let Ok(cu_path) = RegKey::predef(HKEY_CURRENT_USER)
+            .open_subkey(r"SOFTWARE\GitForWindows")
+            .and_then(|key| key.get_value::<String, _>("InstallPath"))
+        {
+            cu_path
         } else {
             return LocateGitSnafu.fail();
-        }
+        };
+        Command::new(git_for_windows_path.join("bin/bash.exe"))
     };
     cmd.args(["-c", s]);
     cmd.current_dir(cwd);