summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManos Pitsidianakis <el13635@mail.ntua.gr>2020-01-28 18:41:50 +0200
committerManos Pitsidianakis <el13635@mail.ntua.gr>2020-01-28 18:41:50 +0200
commitdbc0fd81afe5d012acd913e3ac584529909b736a (patch)
tree8faad2d83fc8e9e89ab9d0c0a91e88e10aa7decf
parent449e526953db7c2e31febe6bd2d0f520bee0a005 (diff)
Rename config file to config.toml
-rw-r--r--sample-config2
-rw-r--r--src/bin.rs4
-rw-r--r--ui/src/conf.rs2
3 files changed, 4 insertions, 4 deletions
diff --git a/sample-config b/sample-config
index dc862120..7c7aa18c 100644
--- a/sample-config
+++ b/sample-config
@@ -4,7 +4,7 @@
# The syntax for including other configuration files is enclosed in `:
#`# include "account_one"`
#`# include "./account_two"`
-#`# include "/home/absolute/path/to/shortcuts/config"`
+#`# include "/home/absolute/path/to/shortcuts/config.toml"`
# That is, the # in the beginning is part of the include directive.
#
#
diff --git a/src/bin.rs b/src/bin.rs
index d6c6eaf1..891115cc 100644
--- a/src/bin.rs
+++ b/src/bin.rs
@@ -191,7 +191,7 @@ fn run_app() -> Result<()> {
println!("");
println!("\t--help, -h\t\tshow this message and exit");
println!("\t--version, -v\t\tprint version and exit");
- println!("\t--create-config[ PATH]\tcreate a sample configuration file with available configuration options. If PATH is not specified, meli will try to create it in $XDG_CONFIG_HOME/meli/config");
+ println!("\t--create-config[ PATH]\tcreate a sample configuration file with available configuration options. If PATH is not specified, meli will try to create it in $XDG_CONFIG_HOME/meli/config.toml");
println!(
"\t--test-config PATH\ttest a configuration file for syntax issues or missing options."
);
@@ -222,7 +222,7 @@ fn run_app() -> Result<()> {
if let Some(config_path) = args.create_config.as_mut() {
let config_path: PathBuf = if config_path.is_empty() {
let xdg_dirs = xdg::BaseDirectories::with_prefix("meli").unwrap();
- xdg_dirs.place_config_file("config").map_err(|e| {
+ xdg_dirs.place_config_file("config.toml").map_err(|e| {
MeliError::new(format!(
"Cannot create configuration directory in {}:\n{}",
xdg_dirs.get_config_home().display(),
diff --git a/ui/src/conf.rs b/ui/src/conf.rs
index 975d1684..514dcf4c 100644
--- a/ui/src/conf.rs
+++ b/ui/src/conf.rs
@@ -295,7 +295,7 @@ impl FileSettings {
Err(_) => xdg_dirs
.as_ref()
.unwrap()
- .place_config_file("config")
+ .place_config_file("config.toml")
.expect("cannot create configuration directory"),
};
if !config_path.exists() {