Documentation update to add the discovery command

Author: Hahihula

docs/src/cli_commands.md

@@ -30,7 +30,8 @@ These options can be used with any command:
 | `remove` | Remove a specific ESP-IDF version |
 | `purge` | Purge all ESP-IDF installations |
 | `import` | Import existing ESP-IDF installation using tools_set_config.json |
-| `discover` | Discover available ESP-IDF versions (not implemented yet) |
+| `discover` | Discover available ESP-IDF versions |
+| `gui` | Run the ESP-IDF Installer GUI with arguments passed through command line |
 
 ## Command Details
 
@@ -138,10 +139,10 @@ If `PATH` is not provided, the command will inform you that no config file was s
 Discover available ESP-IDF versions (not implemented yet).
 
 ```bash
-eim discover
+eim discover [PATH]
 ```
 
-This command is planned to discover ESP-IDF installations on your system but is not yet implemented.
+This command searches for previously installed ESP-IDF versions on your system. If PATH is not provided, the command will search from the root of the filesystem. For any found versions where automatic import is possible, they will be imported into EIM's management. For other found versions that cannot be automatically imported, the command will suggest the appropriate `eim install` command to allow the user to manually reinstall them.
 
 ## Examples
 

src-tauri/src/lib/utils.rs

@@ -407,14 +407,9 @@ pub fn parse_tool_set_config(config_path: &str) -> Result<()> {
 
         let new_activation_script = match std::env::consts::OS {
             "windows" => format!(
-<<<<<<< HEAD
                 "{}\\Microsoft.{}.PowerShell_profile.ps1",
                 activation_script_path,
                 &tool_set.idf_version
-=======
-                "{}\\Microsoft.PowerShell_profile.ps1",
-                activation_script_path
->>>>>>> b06d894 (updated according to changes in the scripts location)
             ),
             _ => format!(
                 "{}/activate_idf_{}.sh",