[rust] Use PowerShell only for previous WMIC commands

Author: bonigarcia

rust/src/files.rs

@@ -19,7 +19,7 @@ use crate::config::OS;
 use crate::config::OS::WINDOWS;
 use crate::{
     format_one_arg, format_three_args, run_shell_command_by_os, Command, Logger, CP_VOLUME_COMMAND,
-    HDIUTIL_ATTACH_COMMAND, HDIUTIL_DETACH_COMMAND, MACOS, PS_MSIEXEC_INSTALL_COMMAND,
+    HDIUTIL_ATTACH_COMMAND, HDIUTIL_DETACH_COMMAND, MACOS, MSIEXEC_INSTALL_COMMAND,
 };
 use anyhow::anyhow;
 use anyhow::Error;
@@ -309,7 +309,7 @@ pub fn install_msi(msi_file: &str, log: &Logger, os: &str) -> Result<(), Error>
         msi_file_name.to_str().unwrap_or_default()
     ));
 
-    let command = Command::new_single(format_one_arg(PS_MSIEXEC_INSTALL_COMMAND, msi_file));
+    let command = Command::new_single(format_one_arg(MSIEXEC_INSTALL_COMMAND, msi_file));
     log.trace(format!("Running command: {}", command.display()));
     run_shell_command_by_os(os, command)?;
 

rust/src/lib.rs

@@ -37,7 +37,8 @@ use crate::metadata::{
 use crate::safari::{SafariManager, SAFARIDRIVER_NAME, SAFARI_NAME};
 use crate::safaritp::{SafariTPManager, SAFARITP_NAMES};
 use crate::shell::{
-    run_shell_command, run_shell_command_by_os, run_shell_command_with_log, Command,
+    run_powershell_command_with_log, run_shell_command, run_shell_command_by_os,
+    run_shell_command_with_log, Command,
 };
 use crate::stats::{send_stats_to_plausible, Props};
 use anyhow::anyhow;
@@ -77,8 +78,6 @@ pub const NIGHTLY: &str = "nightly";
 pub const ESR: &str = "esr";
 pub const PS_GET_VERSION_COMMAND: &str = r#"(Get-Item "{}").VersionInfo.ProductVersion"#;
 pub const PS_GET_OS_COMMAND: &str = "(Get-WmiObject Win32_OperatingSystem).OSArchitecture";
-pub const PS_MSIEXEC_INSTALL_COMMAND: &str =
-    r#"Start-Process -FilePath msiexec -ArgumentList "/i {} /qn ALLOWDOWNGRADE=1" -Wait"#;
 pub const REG_VERSION_ARG: &str = "version";
 pub const REG_CURRENT_VERSION_ARG: &str = "CurrentVersion";
 pub const REG_PV_ARG: &str = "pv";
@@ -87,6 +86,7 @@ pub const PLIST_COMMAND: &str =
 pub const HDIUTIL_ATTACH_COMMAND: &str = "hdiutil attach {}";
 pub const HDIUTIL_DETACH_COMMAND: &str = "hdiutil detach /Volumes/{}";
 pub const CP_VOLUME_COMMAND: &str = "cp -R /Volumes/{}/{}.app {}";
+pub const MSIEXEC_INSTALL_COMMAND: &str = "start /wait msiexec /i {} /qn ALLOWDOWNGRADE=1";
 pub const WINDOWS_CHECK_ADMIN_COMMAND: &str = "net session";
 pub const DASH_VERSION: &str = "{}{}{} -v";
 pub const DASH_DASH_VERSION: &str = "{}{}{} --version";
@@ -444,14 +444,22 @@ pub trait SeleniumManager {
         ));
         let mut browser_version: Option<String> = None;
         for driver_version_command in commands.into_iter() {
-            let output = match run_shell_command_with_log(
-                self.get_logger(),
-                self.get_os(),
-                driver_version_command,
-            ) {
-                Ok(out) => out,
-                Err(_e) => continue,
+            let output = if driver_version_command.display().starts_with("(Get-") {
+                match run_powershell_command_with_log(self.get_logger(), driver_version_command) {
+                    Ok(out) => out,
+                    Err(_e) => continue,
+                }
+            } else {
+                match run_shell_command_with_log(
+                    self.get_logger(),
+                    self.get_os(),
+                    driver_version_command,
+                ) {
+                    Ok(out) => out,
+                    Err(_e) => continue,
+                }
             };
+
             let full_browser_version = parse_version(output, self.get_logger()).unwrap_or_default();
             if full_browser_version.is_empty() {
                 continue;

rust/src/shell.rs

@@ -64,6 +64,13 @@ impl Command {
     }
 }
 
+pub fn run_powershell_command_with_log(log: &Logger, command: Command) -> Result<String, Error> {
+    log.debug(format!("Running command: {}", command.display()));
+    let output = run_powershell_command(command)?;
+    log.debug(format!("Output: {:?}", output));
+    Ok(output)
+}
+
 pub fn run_shell_command_with_log(
     log: &Logger,
     os: &str,
@@ -75,9 +82,13 @@ pub fn run_shell_command_with_log(
     Ok(output)
 }
 
+pub fn run_powershell_command(command: Command) -> Result<String, Error> {
+    run_shell_command("powershell", "-c", command)
+}
+
 pub fn run_shell_command_by_os(os: &str, command: Command) -> Result<String, Error> {
     let (shell, flag) = if WINDOWS.is(os) {
-        ("powershell", "-c")
+        ("cmd", "/c")
     } else {
         ("sh", "-c")
     };