Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed veloren-server-cli to run in interactive basic mode as default. Removed -b and added -t which enables the tui.

Browse Source
This commit is contained in:
Ben Wallis 2021-07-14 20:03:16 +01:00
parent 117035f47b
commit 73b5c03510
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cargo/config
View File

@ -6,9 +6,9 @@ rustflags = [
[alias] [alias]
csv-export = "run --manifest-path common/Cargo.toml --features=bin_csv --bin csv_export" 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" 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-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" 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" 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" server = "run --bin veloren-server-cli"

1
server-cli/Dockerfile
View File

@ -22,4 +22,3 @@ WORKDIR /opt
ENV RUST_BACKTRACE=full ENV RUST_BACKTRACE=full
ENTRYPOINT ["/opt/veloren-server-cli"] ENTRYPOINT ["/opt/veloren-server-cli"]
CMD ["-b"]

7
server-cli/src/cli.rs
View File

@ -99,15 +99,14 @@ pub enum ArgvCommand {
)] )]
pub struct ArgvApp { pub struct ArgvApp {
#[structopt(long, short)] #[structopt(long, short)]
/// Disables the tui /// Enables the tui
pub basic: bool, pub tui: bool,
#[structopt(long, short)] #[structopt(long, short)]
/// Doesn't listen on STDIN /// Doesn't listen on STDIN
/// ///
/// Useful if you want to send the server in background, and your kernels /// 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` /// 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. /// or `nohub` or `tmux` or `screen` or `<<< \"\\004\"` to the program.
/// This implies `-b`.
pub non_interactive: bool, pub non_interactive: bool,
#[structopt(long)] #[structopt(long)]
/// Run without auth enabled /// Run without auth enabled

2
server-cli/src/main.rs
View File

@ -36,7 +36,7 @@ const TPS: u64 = 30;
fn main() -> io::Result<()> { fn main() -> io::Result<()> {
let app = ArgvApp::from_args(); 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 noninteractive = app.non_interactive;
let no_auth = app.no_auth; let no_auth = app.no_auth;
let sql_log_mode = app.sql_log_mode; let sql_log_mode = app.sql_log_mode;