Skip to content

Commit 2473792

Browse files
authored
Fix windows version selection (#311)
1 parent 5d6d796 commit 2473792

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

src-tauri/src/cli/mod.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,6 @@ pub async fn run_cli(cli: Cli) -> anyhow::Result<()> {
160160
if install_args.install_all_prerequisites.is_none() { // if cli argument is not set
161161
settings.install_all_prerequisites = Some(true); // The non-interactive install will always install all prerequisites
162162
}
163-
if install_args.idf_versions.is_none() {
164-
settings.idf_versions = match get_latest_idf_version(false).await {
165-
Ok(Some(version)) => Some(vec![version.name]),
166-
Ok(None) => None,
167-
Err(_) => None,
168-
};
169-
}
170163
debug!("Settings after adjustments: {:?}", settings);
171164
let time = std::time::SystemTime::now();
172165
if !do_not_track {

src-tauri/src/cli/prompts.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ pub async fn select_idf_version(
2525
) -> Result<Vec<String>, String> {
2626
let mut avalible_versions = if target == "all" {
2727
//todo process vector of targets
28-
idf_im_lib::idf_versions::get_idf_names(true).await
28+
// in non-interactive mode, we want to skip pre-releases
29+
idf_im_lib::idf_versions::get_idf_names(!non_interactive).await
2930
} else {
30-
idf_im_lib::idf_versions::get_idf_name_by_target(&target.to_string().to_lowercase(),true).await
31+
// in non-interactive mode, we want to skip pre-releases
32+
idf_im_lib::idf_versions::get_idf_name_by_target(&target.to_string().to_lowercase(),!non_interactive).await
3133
};
3234
avalible_versions.push("master".to_string());
3335
if non_interactive {

0 commit comments

Comments
 (0)