diff --git a/.cargo/config b/.cargo/config index d514696c7e..ba8c095c46 100644 --- a/.cargo/config +++ b/.cargo/config @@ -6,9 +6,9 @@ rustflags = [ [alias] csv-export = "run --manifest-path common/Cargo.toml --features=bin_csv --bin csv_export" csv-import = "run --manifest-path common/Cargo.toml --features=bin_csv --bin csv_import" -test-server = "run --bin veloren-server-cli --no-default-features -- -b" +test-server = "run --bin veloren-server-cli --no-default-features" tracy-server = "-Zunstable-options run --bin veloren-server-cli --no-default-features --features tracy,simd --profile no_overflow" -tracy-world-server = "-Zunstable-options run --bin veloren-server-cli --features tracy,simd --profile no_overflow -- -b" +tracy-world-server = "-Zunstable-options run --bin veloren-server-cli --features tracy,simd --profile no_overflow" test-voxygen = "run --bin veloren-voxygen --no-default-features --features simd,egui-ui" tracy-voxygen = "-Zunstable-options run --bin veloren-voxygen --no-default-features --features tracy,simd,egui-ui --profile no_overflow" server = "run --bin veloren-server-cli" diff --git a/server-cli/Dockerfile b/server-cli/Dockerfile index 0c4033e57d..8bd818f1ac 100644 --- a/server-cli/Dockerfile +++ b/server-cli/Dockerfile @@ -22,4 +22,3 @@ WORKDIR /opt ENV RUST_BACKTRACE=full ENTRYPOINT ["/opt/veloren-server-cli"] -CMD ["-b"] diff --git a/server-cli/src/cli.rs b/server-cli/src/cli.rs index eb5eeeb0c6..421ac93b5d 100644 --- a/server-cli/src/cli.rs +++ b/server-cli/src/cli.rs @@ -99,15 +99,14 @@ pub enum ArgvCommand { )] pub struct ArgvApp { #[structopt(long, short)] - /// Disables the tui - pub basic: bool, + /// Enables the tui + pub tui: bool, #[structopt(long, short)] /// Doesn't listen on STDIN /// /// Useful if you want to send the server in background, and your kernels /// terminal driver will send SIGTTIN to it otherwise. (https://www.gnu.org/savannah-checkouts/gnu/bash/manual/bash.html#Redirections) and you dont want to use `stty -tostop` - /// or `nohub` or `tmux` or `screen` or `<<< \"\\004\"` to the programm. - /// This implies `-b`. + /// or `nohub` or `tmux` or `screen` or `<<< \"\\004\"` to the program. pub non_interactive: bool, #[structopt(long)] /// Run without auth enabled diff --git a/server-cli/src/main.rs b/server-cli/src/main.rs index 944e737246..2e6d78ea96 100644 --- a/server-cli/src/main.rs +++ b/server-cli/src/main.rs @@ -36,7 +36,7 @@ const TPS: u64 = 30; fn main() -> io::Result<()> { let app = ArgvApp::from_args(); - let basic = app.basic || app.command.is_some(); + let basic = !app.tui || app.command.is_some(); let noninteractive = app.non_interactive; let no_auth = app.no_auth; let sql_log_mode = app.sql_log_mode;