mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-30 04:01:58 +00:00
fix: set correct binary name and version on all CLI commands
This commit is contained in:
@@ -7,10 +7,6 @@ use crate::service::cli::{ContainerCliContext, ContainerClientConfig};
|
|||||||
use crate::util::logger::LOGGER;
|
use crate::util::logger::LOGGER;
|
||||||
use crate::version::{Current, VersionT};
|
use crate::version::{Current, VersionT};
|
||||||
|
|
||||||
lazy_static::lazy_static! {
|
|
||||||
static ref VERSION_STRING: String = Current::default().semver().to_string();
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn main(args: impl IntoIterator<Item = OsString>) {
|
pub fn main(args: impl IntoIterator<Item = OsString>) {
|
||||||
LOGGER.enable();
|
LOGGER.enable();
|
||||||
if let Err(e) = CliApp::new(
|
if let Err(e) = CliApp::new(
|
||||||
@@ -18,6 +14,10 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
|
|||||||
crate::service::effects::handler(),
|
crate::service::effects::handler(),
|
||||||
)
|
)
|
||||||
.mutate_command(super::translate_cli)
|
.mutate_command(super::translate_cli)
|
||||||
|
.mutate_command(|cmd| {
|
||||||
|
cmd.name("start-container")
|
||||||
|
.version(Current::default().semver().to_string())
|
||||||
|
})
|
||||||
.run(args)
|
.run(args)
|
||||||
{
|
{
|
||||||
match e.data {
|
match e.data {
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ use tokio::signal::unix::signal;
|
|||||||
use tracing::instrument;
|
use tracing::instrument;
|
||||||
|
|
||||||
use crate::context::CliContext;
|
use crate::context::CliContext;
|
||||||
|
use crate::version::{Current, VersionT};
|
||||||
use crate::context::config::ClientConfig;
|
use crate::context::config::ClientConfig;
|
||||||
use crate::net::web_server::{Acceptor, WebServer};
|
use crate::net::web_server::{Acceptor, WebServer};
|
||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
@@ -101,6 +102,10 @@ pub fn cli(args: impl IntoIterator<Item = OsString>) {
|
|||||||
crate::registry::registry_api(),
|
crate::registry::registry_api(),
|
||||||
)
|
)
|
||||||
.mutate_command(super::translate_cli)
|
.mutate_command(super::translate_cli)
|
||||||
|
.mutate_command(|cmd| {
|
||||||
|
cmd.name("start-registry")
|
||||||
|
.version(Current::default().semver().to_string())
|
||||||
|
})
|
||||||
.run(args)
|
.run(args)
|
||||||
{
|
{
|
||||||
match e.data {
|
match e.data {
|
||||||
|
|||||||
@@ -8,10 +8,6 @@ use crate::context::config::ClientConfig;
|
|||||||
use crate::util::logger::LOGGER;
|
use crate::util::logger::LOGGER;
|
||||||
use crate::version::{Current, VersionT};
|
use crate::version::{Current, VersionT};
|
||||||
|
|
||||||
lazy_static::lazy_static! {
|
|
||||||
static ref VERSION_STRING: String = Current::default().semver().to_string();
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn main(args: impl IntoIterator<Item = OsString>) {
|
pub fn main(args: impl IntoIterator<Item = OsString>) {
|
||||||
LOGGER.enable();
|
LOGGER.enable();
|
||||||
|
|
||||||
@@ -20,6 +16,10 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
|
|||||||
crate::main_api(),
|
crate::main_api(),
|
||||||
)
|
)
|
||||||
.mutate_command(super::translate_cli)
|
.mutate_command(super::translate_cli)
|
||||||
|
.mutate_command(|cmd| {
|
||||||
|
cmd.name("start-cli")
|
||||||
|
.version(Current::default().semver().to_string())
|
||||||
|
})
|
||||||
.run(args)
|
.run(args)
|
||||||
{
|
{
|
||||||
match e.data {
|
match e.data {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ use tracing::instrument;
|
|||||||
use visit_rs::Visit;
|
use visit_rs::Visit;
|
||||||
|
|
||||||
use crate::context::CliContext;
|
use crate::context::CliContext;
|
||||||
|
use crate::version::{Current, VersionT};
|
||||||
use crate::context::config::ClientConfig;
|
use crate::context::config::ClientConfig;
|
||||||
use crate::net::tls::TlsListener;
|
use crate::net::tls::TlsListener;
|
||||||
use crate::net::web_server::{Accept, Acceptor, MetadataVisitor, WebServer};
|
use crate::net::web_server::{Accept, Acceptor, MetadataVisitor, WebServer};
|
||||||
@@ -186,6 +187,10 @@ pub fn cli(args: impl IntoIterator<Item = OsString>) {
|
|||||||
crate::tunnel::api::tunnel_api(),
|
crate::tunnel::api::tunnel_api(),
|
||||||
)
|
)
|
||||||
.mutate_command(super::translate_cli)
|
.mutate_command(super::translate_cli)
|
||||||
|
.mutate_command(|cmd| {
|
||||||
|
cmd.name("start-tunnel")
|
||||||
|
.version(Current::default().semver().to_string())
|
||||||
|
})
|
||||||
.run(args)
|
.run(args)
|
||||||
{
|
{
|
||||||
match e.data {
|
match e.data {
|
||||||
|
|||||||
Reference in New Issue
Block a user