diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | .whirl/Config.example.toml (renamed from .whirl/Whirl.example.toml) | 0 | ||||
| -rw-r--r-- | crates/whirl_config/Config.default.toml (renamed from crates/whirl_config/Whirl.default.toml) | 0 | ||||
| -rw-r--r-- | crates/whirl_config/src/lib.rs | 2 | ||||
| -rw-r--r-- | crates/whirl_prompt/src/builtins/constants.rs | 2 | ||||
| -rw-r--r-- | crates/whirl_prompt/src/builtins/mod.rs | 2 |
6 files changed, 6 insertions, 4 deletions
@@ -15,9 +15,11 @@ Cargo.lock # Development /src/_*.* -/.whirl/ /.secrets /crates/**/target/ +/.whirl/log/ +/.whirl/Config.toml +/.whirl/whirl.sqlite3 # Wireshark *.pcapng diff --git a/.whirl/Whirl.example.toml b/.whirl/Config.example.toml index aa2d684..aa2d684 100644 --- a/.whirl/Whirl.example.toml +++ b/.whirl/Config.example.toml diff --git a/crates/whirl_config/Whirl.default.toml b/crates/whirl_config/Config.default.toml index aa2d684..aa2d684 100644 --- a/crates/whirl_config/Whirl.default.toml +++ b/crates/whirl_config/Config.default.toml diff --git a/crates/whirl_config/src/lib.rs b/crates/whirl_config/src/lib.rs index 47b26a8..93328ca 100644 --- a/crates/whirl_config/src/lib.rs +++ b/crates/whirl_config/src/lib.rs @@ -59,7 +59,7 @@ impl Config { fn load() -> Result<Self, ConfigError> { let mut s = config::Config::new(); - s.merge(File::with_name(".whirl/Whirl.toml").required(false))?; + s.merge(File::with_name(".whirl/Config.toml").required(false))?; s.try_into() } diff --git a/crates/whirl_prompt/src/builtins/constants.rs b/crates/whirl_prompt/src/builtins/constants.rs index e87cceb..8ba67bc 100644 --- a/crates/whirl_prompt/src/builtins/constants.rs +++ b/crates/whirl_prompt/src/builtins/constants.rs @@ -1,7 +1,7 @@ // Copyleft (ɔ) 2021-2021 The Whirlsplash Collective // SPDX-License-Identifier: GPL-3.0-only -pub const FILES: [&str; 2] = ["README.rst", "Whirl.toml"]; +pub const FILES: [&str; 2] = ["README.rst", "Config.toml"]; pub const HELPABLES_BUILTINS: [&str; 8] = [ "cat - display the contents of a present file", "config - manipulate the configuration", diff --git a/crates/whirl_prompt/src/builtins/mod.rs b/crates/whirl_prompt/src/builtins/mod.rs index 655f507..db9cb64 100644 --- a/crates/whirl_prompt/src/builtins/mod.rs +++ b/crates/whirl_prompt/src/builtins/mod.rs @@ -64,7 +64,7 @@ pub fn builtin_cat(args: &[String]) -> i32 { .unwrap(); transfer.perform().unwrap(); } - "Whirl.toml" => { + "Config.toml" => { colour::red_ln!("NOTE: This is just a wrapper for `config show`."); println!("{:#?}", Config::get()); } |