updated activation script creation

Author: Hahihula

src-tauri/src/lib/mod.rs

@@ -1495,7 +1495,7 @@ pub fn single_version_post_install(
         _ => {
             let install_folder = PathBuf::from(version_instalation_path);
             let install_path = install_folder.parent().unwrap().to_str().unwrap();
-            let _ = create_activation_shell_script(
+            match create_activation_shell_script(
                 // todo: handle error
                 install_path,
                 idf_path,
@@ -1504,7 +1504,13 @@ pub fn single_version_post_install(
                 idf_version,
                 export_paths,
                 env_vars,
-            );
+            ) {
+                Ok(_) => info!("Activation shell script created successfully at {:?}", install_path),
+                Err(err) => error!(
+                    "Failed to create activation shell script: {:?}",
+                    err.to_string()
+                ),
+            }
             // copy openocd rules (it's noop on macOs)
             match copy_openocd_rules(tool_install_directory) {
                 Ok(_) => info!("OpenOCD rules copied successfully"),

src-tauri/src/lib/utils.rs

@@ -442,11 +442,15 @@ pub fn parse_esp_idf_json(idf_json_path: &str) -> Result<()> {
         let idf_path = value.path;
         let python = value.python;
         let tools_path = config.idf_tools_path.clone();
+        let path_for_activation_script = idf_json_path.parent().unwrap().to_str().unwrap();
+
         println!("IDF tools path: {}", tools_path);
         println!("IDF version: {}", idf_version);
+        println!("activation script path: {}", path_for_activation_script);
+        println!("Python path: {}", python);
         let export_paths = vec![config.git_path.clone()];
         match import_single_version(
-            idf_json_path.parent().unwrap().to_str().unwrap(),
+            path_for_activation_script,
             &idf_path,
             &idf_version,
             &tools_path,
@@ -575,7 +579,7 @@ pub fn import_single_version(path_to_create_activation_script: &str,idf_location
     return Ok(());
   };
   let python_env = python.clone().and_then(|s| {
-    s.find("python_env").map(|index| s[..=index+9].to_string())
+    s.find("bin").map(|index| s[..=index-1].to_string())
   });
   single_version_post_install(
     path_to_create_activation_script,
@@ -592,7 +596,7 @@ pub fn import_single_version(path_to_create_activation_script: &str,idf_location
     ),
     _ => format!(
         "{}/activate_idf_{}.sh",
-        path_to_create_activation_script,
+        PathBuf::from(path_to_create_activation_script).parent().unwrap().to_str().unwrap(),
         idf_version
     ),
   };