diff --git a/Cargo.lock b/Cargo.lock index 8e4c7d79f587494f14e3aa86e1499c43d3356164..02308ce7a323b34f6b47084a7e8792c89201e7d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -832,6 +832,23 @@ dependencies = [ "thiserror", ] +[[package]] +name = "duniter-cli" +version = "1.8.1" +dependencies = [ + "anyhow", + "ctrlc", + "daemonize-me", + "dirs", + "log", + "logwatcher", + "nix 0.17.0", + "read_input", + "rusty-hook", + "serde_json", + "structopt", +] + [[package]] name = "duniter-conf" version = "0.1.0" @@ -1040,23 +1057,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "duniter-launcher" -version = "1.8.1" -dependencies = [ - "anyhow", - "ctrlc", - "daemonize-me", - "dirs", - "log", - "logwatcher", - "nix 0.17.0", - "read_input", - "rusty-hook", - "serde_json", - "structopt", -] - [[package]] name = "duniter-mempools" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 7757337256c1a47c96e64a746f96f3780f8ab8f0..a73d885fc4753b7c8b9d77532d2d06d66362bbc1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,13 +4,13 @@ description = "Duniter launcher." edition = "2018" keywords = ["duniter", "launcher"] license = "AGPL-3.0" -name = "duniter-launcher" +name = "duniter-cli" repository = "https://git.duniter.org/nodes/typescript/duniter" version = "1.8.1" [[bin]] bench = false -path = "rust-bins/duniter-launcher/src/main.rs" +path = "rust-bins/duniter-cli/src/main.rs" name = "duniter" [dependencies] diff --git a/release/Makefile b/release/Makefile index 3b9617d920f7f310ffbc30860498e89b61820849..4a2cec18204b78e6f54dc0fe3622eca9faa5955b 100644 --- a/release/Makefile +++ b/release/Makefile @@ -85,7 +85,7 @@ base-gui: $(call nodedep,duniter-ui) base # Build the base .PHONY: base base: | node_modules - @cargo build --release -p duniter-launcher + @cargo build --release -p duniter-cli @mv target/release/duniter bin/duniter index.html: $(call nodedep,duniter-ui) $(addprefix node_modules/,$(leveldown.COMPILED) $(sqlite3.COMPILED)) diff --git a/rust-bins/duniter-launcher/src/config.rs b/rust-bins/duniter-cli/src/config.rs similarity index 100% rename from rust-bins/duniter-launcher/src/config.rs rename to rust-bins/duniter-cli/src/config.rs diff --git a/rust-bins/duniter-launcher/src/daemon.rs b/rust-bins/duniter-cli/src/daemon.rs similarity index 100% rename from rust-bins/duniter-launcher/src/daemon.rs rename to rust-bins/duniter-cli/src/daemon.rs diff --git a/rust-bins/duniter-launcher/src/duniter_ts_args.rs b/rust-bins/duniter-cli/src/duniter_ts_args.rs similarity index 100% rename from rust-bins/duniter-launcher/src/duniter_ts_args.rs rename to rust-bins/duniter-cli/src/duniter_ts_args.rs diff --git a/rust-bins/duniter-launcher/src/main.rs b/rust-bins/duniter-cli/src/main.rs similarity index 100% rename from rust-bins/duniter-launcher/src/main.rs rename to rust-bins/duniter-cli/src/main.rs diff --git a/rust-bins/duniter-launcher/src/sync.rs b/rust-bins/duniter-cli/src/sync.rs similarity index 100% rename from rust-bins/duniter-launcher/src/sync.rs rename to rust-bins/duniter-cli/src/sync.rs diff --git a/rust-bins/duniter-launcher/src/wizard_gva.rs b/rust-bins/duniter-cli/src/wizard_gva.rs similarity index 100% rename from rust-bins/duniter-launcher/src/wizard_gva.rs rename to rust-bins/duniter-cli/src/wizard_gva.rs diff --git a/rust-bins/xtask/src/main.rs b/rust-bins/xtask/src/main.rs index ebbfabb6fd215f1cdfe25a39f79411042f7019cc..85fe22a16b18de20267550b77bc33dae0295fdd3 100644 --- a/rust-bins/xtask/src/main.rs +++ b/rust-bins/xtask/src/main.rs @@ -114,7 +114,7 @@ fn build(skip_npm: bool, production: bool) -> Result<()> { exec_should_success(Command::new("npm").args(&["prune", "--production"]))?; } } - println!("Build duniter-launcher …"); + println!("Build duniter-cli …"); exec_should_success(Command::new("cargo").args(&["build", "--release"]))?; std::fs::copy("target/release/duniter", "bin/duniter")?; Ok(())