artemist/lix-installer
0
0
Fork 0
forked from lix-project/lix-installer
Code Pull requests Activity

Fix exit code inconsistency (#684)

Browse source
This commit is contained in:
Ana Hobden 2023-10-23 13:52:42 -07:00 committed by GitHub
parent c79dcb91ae
commit 2dd40810fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cli/subcommand/install.rs
View file

@ -128,8 +128,8 @@ impl CommandExecute for Install {
eprintln!("{}", format!("Found existing plan in `{RECEIPT_LOCATION}` which used different planner settings, try uninstalling the existing install with `{uninstall_command}`").red()); eprintln!("{}", format!("Found existing plan in `{RECEIPT_LOCATION}` which used different planner settings, try uninstalling the existing install with `{uninstall_command}`").red());
return Ok(ExitCode::FAILURE) return Ok(ExitCode::FAILURE)
} }
eprintln!("{}", format!("Found existing plan in `{RECEIPT_LOCATION}`, with the same settings, already completed, try uninstalling (`{uninstall_command}`) and reinstalling if Nix isn't working").red()); eprintln!("{}", format!("Found existing plan in `{RECEIPT_LOCATION}`, with the same settings, already completed. Try uninstalling (`{uninstall_command}`) and reinstalling if Nix isn't working").red());
return Ok(ExitCode::FAILURE) return Ok(ExitCode::SUCCESS)
}, },
None => { None => {
let res = planner.plan().await; let res = planner.plan().await;
@ -180,7 +180,7 @@ impl CommandExecute for Install {
return Ok(ExitCode::FAILURE) return Ok(ExitCode::FAILURE)
} }
if existing_receipt.actions.iter().all(|v| v.state == ActionState::Completed) { if existing_receipt.actions.iter().all(|v| v.state == ActionState::Completed) {
eprintln!("{}", format!("Found existing plan in `{RECEIPT_LOCATION}`, with the same settings, already completed, try uninstalling (`{uninstall_command}`) and reinstalling if Nix isn't working").yellow()); eprintln!("{}", format!("Found existing plan in `{RECEIPT_LOCATION}`, with the same settings, already completed. Try uninstalling (`{uninstall_command}`) and reinstalling if Nix isn't working").yellow());
return Ok(ExitCode::SUCCESS) return Ok(ExitCode::SUCCESS)
} }
existing_receipt existing_receipt