[rust] Read PROCESSOR_ARCHITECTURE env in Windows to determine architecture

Author: bonigarcia

rust/src/config.rs

@@ -18,8 +18,8 @@
 use crate::config::OS::{LINUX, MACOS, WINDOWS};
 use crate::shell::{run_powershell_command, run_shell_command_by_os};
 use crate::{
-    default_cache_folder, format_one_arg, path_to_string, Command, REQUEST_TIMEOUT_SEC,
-    UNAME_COMMAND,
+    default_cache_folder, format_one_arg, path_to_string, Command, ENV_CPU_ARCHITECTURE,
+    REQUEST_TIMEOUT_SEC, UNAME_COMMAND,
 };
 use crate::{ARCH_AMD64, ARCH_ARM64, ARCH_X86, PS_GET_OS_COMMAND, TTL_SEC};
 use anyhow::anyhow;
@@ -69,11 +69,14 @@ impl ManagerConfig {
 
         let self_os = OS;
         let self_arch = if WINDOWS.is(self_os) {
-            let get_os_command = Command::new_single(PS_GET_OS_COMMAND.to_string());
-            let output = run_powershell_command(get_os_command).unwrap_or_default();
-            if output.contains("32") {
+            let mut cpu_arch = env::var(ENV_CPU_ARCHITECTURE).unwrap_or_default();
+            if cpu_arch.is_empty() {
+                let get_os_command = Command::new_single(PS_GET_OS_COMMAND.to_string());
+                cpu_arch = run_powershell_command(get_os_command).unwrap_or_default();
+            }
+            if cpu_arch.contains("32") {
                 ARCH_X86.to_string()
-            } else if output.contains("ARM") {
+            } else if cpu_arch.contains("ARM") {
                 ARCH_ARM64.to_string()
             } else {
                 ARCH_AMD64.to_string()

rust/src/lib.rs

@@ -95,6 +95,7 @@ pub const SINGLE_QUOTE: &str = "'";
 pub const ENV_PROGRAM_FILES: &str = "PROGRAMFILES";
 pub const ENV_PROGRAM_FILES_X86: &str = "PROGRAMFILES(X86)";
 pub const ENV_LOCALAPPDATA: &str = "LOCALAPPDATA";
+pub const ENV_CPU_ARCHITECTURE: &str = "PROCESSOR_ARCHITECTURE";
 pub const ENV_X86: &str = " (x86)";
 pub const ARCH_X86: &str = "x86";
 pub const ARCH_AMD64: &str = "amd64";