From e2b545ae396354cd009c12dc44daadac923f140b Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sun, 14 Jul 2024 20:14:00 +0100 Subject: [PATCH] fix: move default.toml inside crate that uses it --- README.md | 2 +- default.toml => crates/cli/default.toml | 0 crates/cli/src/init.rs | 2 +- crates/cli/src/tests.rs | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename default.toml => crates/cli/default.toml (100%) diff --git a/README.md b/README.md index 7e60783..4024cf8 100644 --- a/README.md +++ b/README.md @@ -318,7 +318,7 @@ The create the default config file, run this command: git next server init ``` -This will create a `git-next-server.toml` file. [Default](./server-default.toml) +This will create a `git-next-server.toml` file. [Default](./crates/server/server-default.toml) Edit this file to your needs. See the [Configuration](#configuration) section above. diff --git a/default.toml b/crates/cli/default.toml similarity index 100% rename from default.toml rename to crates/cli/default.toml diff --git a/crates/cli/src/init.rs b/crates/cli/src/init.rs index ca1b68f..915d5ef 100644 --- a/crates/cli/src/init.rs +++ b/crates/cli/src/init.rs @@ -11,7 +11,7 @@ pub fn run(fs: FileSystem) { file_name ); } else { - match fs.file_write(&pathbuf, include_str!("../../../default.toml")) { + match fs.file_write(&pathbuf, include_str!("../default.toml")) { Ok(_) => { println!("Created a default configuration file at {}", file_name); } diff --git a/crates/cli/src/tests.rs b/crates/cli/src/tests.rs index 0980089..e5ab069 100644 --- a/crates/cli/src/tests.rs +++ b/crates/cli/src/tests.rs @@ -31,7 +31,7 @@ mod init { assert_eq!( fs.file_read_to_string(&file)?, - include_str!("../../../default.toml"), + include_str!("../default.toml"), "The file does not match the default template" );