Skip to content

Commit 4cf4df7

Browse files
committed
feat: re-add ask config onboard ui
1 parent 5589cc9 commit 4cf4df7

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

cli/src/actions/workspace.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use dialoguer::{theme::ColorfulTheme, Confirm, FuzzySelect, Input};
88
use log::info;
99

1010
use crate::{
11-
config::{ask_for_init_config, patch_instance_config, patch_workspace_config},
11+
config::{ask_for_config, patch_instance_config, patch_workspace_config},
1212
download::{download_file, pick_latest_rootfs, CIEL_MAINLINE_ARCHS, CIEL_RETRO_ARCHS},
1313
logger::style_bool,
1414
make_progress_bar,
@@ -75,7 +75,7 @@ pub fn new_workspace(args: &ArgMatches) -> Result<()> {
7575
if arch.is_none() {
7676
arch = Some(ask_for_target_arch()?.to_owned())
7777
}
78-
ask_for_init_config(&mut config)?;
78+
ask_for_config(&mut config)?;
7979
} else {
8080
info!("Running in unattended mode, using default configuration ...");
8181
}

cli/src/config.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ pub fn config_instance(instance: &str, args: &ArgMatches) -> Result<()> {
8181

8282
/// Applies workspace configuration patches from [ArgMatches].
8383
pub fn patch_workspace_config(args: &ArgMatches, config: &mut WorkspaceConfig) -> Result<()> {
84+
if !args.args_present() {
85+
ask_for_config(config)?;
86+
return Ok(());
87+
}
88+
8489
if let Some(maintainer) = args.get_one::<String>("maintainer") {
8590
if maintainer != &config.maintainer {
8691
WorkspaceConfig::validate_maintainer(maintainer)?;
@@ -138,7 +143,7 @@ pub fn patch_instance_config(args: &ArgMatches, config: &mut InstanceConfig) ->
138143
}
139144

140145
/// Shows a series of prompts to let the user select the configurations
141-
pub fn ask_for_init_config(config: &mut WorkspaceConfig) -> Result<()> {
146+
pub fn ask_for_config(config: &mut WorkspaceConfig) -> Result<()> {
142147
let theme = ColorfulTheme::default();
143148
config.maintainer = Input::<String>::with_theme(&theme)
144149
.with_prompt("Maintainer")

0 commit comments

Comments
 (0)