[rust] Bug-fix: ensure driver file name in unzip logic

bonigarcia · bonigarcia · commit f104ccd3932e · 2023-07-21T18:35:41.000+02:00
diff --git a/rust/src/files.rs b/rust/src/files.rs
@@ -123,7 +123,7 @@ pub fn unzip(file: File, target: &Path, log: &Logger) -> Result<(), Box<dyn Erro
             continue;
         }
         let target_file_name = target.file_name().unwrap().to_str().unwrap();
-        if file.name().ends_with(target_file_name) {
+        if target_file_name.eq(get_raw_file_name(file.name())) {
             log.debug(format!(
                 "File extracted to {} ({} bytes)",
                 target.display(),
@@ -149,6 +149,15 @@ pub fn unzip(file: File, target: &Path, log: &Logger) -> Result<(), Box<dyn Erro
     Ok(())
 }
 
+pub fn get_raw_file_name(file_name: &str) -> &str {
+    let mut raw_file_name = file_name;
+    let separator_index = file_name.rfind('/').unwrap_or_default();
+    if separator_index != 0 {
+        raw_file_name = &file_name[separator_index + 1..]
+    }
+    raw_file_name
+}
+
 pub fn compose_cache_folder() -> PathBuf {
     if let Some(base_dirs) = BaseDirs::new() {
         return Path::new(base_dirs.home_dir())
