Merge pull request #14 from cfsamson/issue13

Corrected bug which always triggered fallback search algorithm.

Author: cfsamson

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "powershell_script"
-version = "1.0.4"
+version = "1.1.0"
 authors = ["Carl Fredrik Samson <cf@samson.no>"]
 edition = "2018"
 repository = "https://github.com/cfsamson/powershell-script"
@@ -16,6 +16,7 @@ A library for running Windows PowerShell scripts
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
+
 # Use PowerShell Core instead of Windows Powershell.
 core = []
 

src/lib.rs

@@ -86,11 +86,11 @@ mod target;
 
 #[cfg(all(not(feature = "core"), windows))]
 /// Windows PowerShell
-const POWERSHELL_NAME: &str = "PowerShell";
+const POWERSHELL_NAME: &str = "PowerShell.exe";
 
 #[cfg(any(feature = "core", not(windows)))]
 /// PowerShell Core
-const POWERSHELL_NAME: &str = "pwsh";
+const POWERSHELL_NAME: &str = "pwsh.exe";
 
 type Result<T> = std::result::Result<T, PsError>;
 

src/target/windows.rs

@@ -29,7 +29,8 @@ impl PsScript {
     }
 
     fn run_raw(&self, script: &str) -> Result<process::Output> {
-        let mut cmd = Command::new(get_powershell_path()?);
+        let pws_path = get_powershell_path()?;
+        let mut cmd = Command::new(pws_path);
 
         cmd.stdin(Stdio::piped());
         cmd.stdout(Stdio::piped());
@@ -62,12 +63,15 @@ fn is_program_on_path(program_name: &str) -> Option<bool> {
         Ok(x) => x,
         Err(_e) => return None,
     };
+    
     for path_dir in system_path.split(PATH_SPLITTER) {
         let path = std::path::Path::new(path_dir).join(&program_name);
+        
         if path.exists() {
             return Some(true);
         }
     }
+    
     return Some(false);
 }