Simplify base-dir arg: drop env alias, keep default
Switched base_dir from Option<PathBuf> to PathBuf with a facet
default of "/var/quire-ci". Removed the QQUIRE_CI_BASE_DIR env alias
to keep things simple.
Assisted-by: Owl Alpha via pi
diff --git a/quire-ci/src/main.rs b/quire-ci/src/main.rs
index 1839535..891c29a 100644
--- a/quire-ci/src/main.rs
+++ b/quire-ci/src/main.rs
@@ -48,8 +48,8 @@ const VERSION: &str = env!("QUIRE_VERSION");
#[derive(Facet)]
struct Cli {
/// Root directory for quire-ci data (default: /var/quire-ci).
- #[facet(args::named, args::env_alias = "QUIRE_CI_BASE_DIR")]
- base_dir: Option<PathBuf>,
+ #[facet(args::named, default = "/var/quire-ci")]
+ base_dir: PathBuf,
/// Workspace root containing .quire/ci.fnl. Defaults to cwd.
#[facet(args::named, args::short = 'w', default = ".")]
@@ -298,10 +298,7 @@ fn main() -> Result<()> {
match cli.command {
Commands::Validate => validate(workspace),
Commands::Serve => {
- let quire = match cli.base_dir {
- Some(ref dir) => quire::QuireCi::new(dir.clone()),
- None => quire::QuireCi::default(),
- };
+ let quire = quire::QuireCi::new(cli.base_dir);
let rt = tokio::runtime::Builder::new_multi_thread()
.enable_all()
.build()