Merge branch 'trunk' into Issue_12549_FixAtomsGenerationLowdash

Author: AutomatedTester

.bazelrc

@@ -105,6 +105,7 @@ test --test_env=JRUBY_OPTS="--dev"
 
 test:windows --test_env=PATH
 test:windows --test_env=LOCALAPPDATA
+test:windows --test_env=PROCESSOR_ARCHITECTURE
 test:windows --test_env=PROGRAMFILES="C:\\Program Files"
 test:windows --test_env=PROGRAMFILES(X86)="C:\\Program Files (x86)"
 

rust/src/config.rs

@@ -18,8 +18,8 @@
 use crate::config::OS::{LINUX, MACOS, WINDOWS};
 use crate::shell::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_PROCESSOR_ARCHITECTURE,
+    REQUEST_TIMEOUT_SEC, UNAME_COMMAND,
 };
 use crate::{ARCH_AMD64, ARCH_ARM64, ARCH_X86, TTL_SEC, WMIC_COMMAND_OS};
 use anyhow::anyhow;
@@ -69,11 +69,14 @@ impl ManagerConfig {
 
         let self_os = OS;
         let self_arch = if WINDOWS.is(self_os) {
-            let wmic_command = Command::new_single(WMIC_COMMAND_OS.to_string());
-            let wmic_output = run_shell_command_by_os(self_os, wmic_command).unwrap_or_default();
-            if wmic_output.contains("32") {
+            let mut architecture = env::var(ENV_PROCESSOR_ARCHITECTURE).unwrap_or_default();
+            if architecture.is_empty() {
+                let get_os_command = Command::new_single(WMIC_COMMAND_OS.to_string());
+                architecture = run_shell_command_by_os(self_os, get_os_command).unwrap_or_default();
+            }
+            if architecture.contains("32") {
                 ARCH_X86.to_string()
-            } else if wmic_output.contains("ARM") {
+            } else if architecture.contains("ARM") {
                 ARCH_ARM64.to_string()
             } else {
                 ARCH_AMD64.to_string()

rust/src/lib.rs

@@ -94,11 +94,11 @@ 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_PROCESSOR_ARCHITECTURE: &str = "PROCESSOR_ARCHITECTURE";
 pub const ENV_X86: &str = " (x86)";
 pub const ARCH_X86: &str = "x86";
 pub const ARCH_AMD64: &str = "amd64";
 pub const ARCH_ARM64: &str = "arm64";
-pub const ENV_PROCESSOR_ARCHITECTURE: &str = "PROCESSOR_ARCHITECTURE";
 pub const TTL_SEC: u64 = 3600;
 pub const UNAME_COMMAND: &str = "uname -{}";
 pub const ESCAPE_COMMAND: &str = r#"printf %q "{}""#;

rust/src/lock.rs

@@ -53,21 +53,15 @@ impl Lock {
 
         log.debug(format!("Acquiring lock: {}", path.display()));
         file.lock_exclusive().unwrap_or_default();
-
-        LOCK_PATH.with(|option| {
-            *option.borrow_mut() = Some(lock_folder.to_path_buf());
-        });
+        set_lock_path(Some(path.to_path_buf()));
 
         Ok(Self { file, path })
     }
 
     pub fn release(&mut self) {
         fs::remove_file(&self.path).unwrap_or_default();
         self.file.unlock().unwrap_or_default();
-
-        LOCK_PATH.with(|option| {
-            *option.borrow_mut() = None;
-        });
+        set_lock_path(None);
     }
 
     pub fn exists(&mut self) -> bool {
@@ -76,14 +70,21 @@ impl Lock {
 }
 
 pub fn clear_lock_if_required() {
-    let mut lock_path: Option<PathBuf> = None;
-    LOCK_PATH.with(|option| {
-        let optional_path = &*option.borrow();
-        if optional_path.is_some() {
-            lock_path = Some(optional_path.as_ref().unwrap().to_path_buf());
-        }
-    });
+    let lock_path = get_lock_path();
     if lock_path.is_some() {
-        fs::remove_dir_all(lock_path.unwrap()).unwrap_or_default();
+        let lock = lock_path.unwrap();
+        if lock.exists() {
+            fs::remove_dir_all(lock.parent().unwrap()).unwrap_or_default();
+        }
     }
 }
+
+fn set_lock_path(path: Option<PathBuf>) {
+    LOCK_PATH.with(|lock_path| {
+        *lock_path.borrow_mut() = path;
+    });
+}
+
+fn get_lock_path() -> Option<PathBuf> {
+    LOCK_PATH.with(|lock_path| lock_path.borrow().clone())
+}