fix: rename -e to -d
Check and Lint / Check (pull_request) Successful in 18s
Check and Lint / Rustfmt (pull_request) Successful in 15s
Check and Lint / Clippy (pull_request) Successful in 19s
Test and Coverage / Test (pull_request) Successful in 20s
Check and Lint / Build RPM (pull_request) Successful in 28s
Test and Coverage / Coverage (pull_request) Successful in 41s
Check and Lint / Rustfmt (push) Successful in 16s
Check and Lint / Clippy (push) Successful in 19s
Check and Lint / Check (push) Successful in 24s
Test and Coverage / Test (push) Successful in 20s
Check and Lint / Build RPM (push) Successful in 28s
Release / Semantic release (push) Successful in 49s
Test and Coverage / Coverage (push) Successful in 44s
Release / Build and push RPM (push) Successful in 1m18s
Check and Lint / Check (pull_request) Successful in 18s
Check and Lint / Rustfmt (pull_request) Successful in 15s
Check and Lint / Clippy (pull_request) Successful in 19s
Test and Coverage / Test (pull_request) Successful in 20s
Check and Lint / Build RPM (pull_request) Successful in 28s
Test and Coverage / Coverage (pull_request) Successful in 41s
Check and Lint / Rustfmt (push) Successful in 16s
Check and Lint / Clippy (push) Successful in 19s
Check and Lint / Check (push) Successful in 24s
Test and Coverage / Test (push) Successful in 20s
Check and Lint / Build RPM (push) Successful in 28s
Release / Semantic release (push) Successful in 49s
Test and Coverage / Coverage (push) Successful in 44s
Release / Build and push RPM (push) Successful in 1m18s
This commit was merged in pull request #21.
This commit is contained in:
+12
-9
@@ -56,16 +56,16 @@ enum Command {
|
|||||||
/// Launch the AareGUI with default settings
|
/// Launch the AareGUI with default settings
|
||||||
#[command(alias = "g")]
|
#[command(alias = "g")]
|
||||||
Gui {
|
Gui {
|
||||||
/// Config entry (deployment) to launch. Defaults to the detected beamline.
|
/// Deployment to launch. Defaults to the detected beamline.
|
||||||
#[arg(long)]
|
#[arg(short = 'd', long)]
|
||||||
entry: Option<String>,
|
deployment: Option<String>,
|
||||||
},
|
},
|
||||||
/// Launch the AareDAQ server with default settings
|
/// Launch the AareDAQ server with default settings
|
||||||
#[command(alias = "s")]
|
#[command(alias = "s")]
|
||||||
Server {
|
Server {
|
||||||
/// Config entry (deployment) to launch. Defaults to the detected beamline.
|
/// Deployment to launch. Defaults to the detected beamline.
|
||||||
#[arg(long)]
|
#[arg(short = 'd', long)]
|
||||||
entry: Option<String>,
|
deployment: Option<String>,
|
||||||
|
|
||||||
/// Env file (`key=value` per line) added to the server's environment.
|
/// Env file (`key=value` per line) added to the server's environment.
|
||||||
/// Ignored with a warning if it does not exist.
|
/// Ignored with a warning if it does not exist.
|
||||||
@@ -101,10 +101,13 @@ fn main() -> Result<()> {
|
|||||||
launcher::launch_with_env(&launch.python, &launch.entrypoint, &env)?;
|
launcher::launch_with_env(&launch.python, &launch.entrypoint, &env)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Command::Gui { entry } => launcher::launch_gui(lookup_entry(&config, entry)?)?,
|
Command::Gui { deployment } => launcher::launch_gui(lookup_entry(&config, deployment)?)?,
|
||||||
Command::Server { entry, env_file } => {
|
Command::Server {
|
||||||
|
deployment,
|
||||||
|
env_file,
|
||||||
|
} => {
|
||||||
let env = env_file::load_env_file(&env_file);
|
let env = env_file::load_env_file(&env_file);
|
||||||
launcher::launch_server(lookup_entry(&config, entry)?, &env)?
|
launcher::launch_server(lookup_entry(&config, deployment)?, &env)?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user