Skip to content

fix: multiple targets cant be specified #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
weriomat wants to merge 1 commit into from
Closed

fix: multiple targets cant be specified #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@ use tokio::process::Command;
#[command(version = "1.0", author = "Serokell <https://serokell.io/>")]
pub struct Opts {
/// The flake to deploy
#[arg(group = "deploy")]
target: Option<String>,

/// A list of flakes to deploy alternatively
#[arg(long, group = "deploy")]
#[arg(long)]
targets: Option<Vec<String>>,
/// Treat targets as files instead of flakes
#[clap(short, long)]
#[arg(short, long)]
file: Option<String>,
/// Check signatures when using `nix copy`
#[arg(short, long)]
Expand Down Expand Up @@ -677,10 +676,19 @@ pub async fn run(args: Option<&ArgMatches>) -> Result<(), RunError> {
error!("Cannot use both --dry-activate & --boot!");
}

let deploys = opts
.clone()
.targets
.unwrap_or_else(|| vec![opts.clone().target.unwrap_or_else(|| ".".to_string())]);
let deploys = match opts.targets.is_some() && opts.target.is_some() {
true => {
let mut targets = opts.targets.unwrap();
targets.push(opts.target.unwrap());
targets
}
false => opts
.clone()
.targets
.unwrap_or_else(|| vec![opts.clone().target.unwrap_or_else(|| ".".to_string())]),
};

debug!("Deploying the following configurations {:?}", deploys);

let deploy_flakes: Vec<DeployFlake> =
if let Some(file) = &opts.file {
Expand Down