Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support $XDG_CONFIG_HOME #87

Merged
merged 2 commits into from
Aug 2, 2022
Merged

support $XDG_CONFIG_HOME #87

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1078fdc
support $XDG_CONFIG_HOME
kaplanelad Aug 2, 2022
c715629
support $XDG_CONFIG_HOME
kaplanelad Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions shellfirm/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use anyhow::anyhow;
use anyhow::Result as AnyResult;
use log::debug;
use serde_derive::{Deserialize, Serialize};
use std::env;
use std::fs;
use std::io;
use std::io::{Read, Write};
Expand Down Expand Up @@ -340,12 +341,23 @@ pub fn get_config_folder(all_checks: Vec<Check>) -> AnyResult<Config> {

match dirs::home_dir() {
Some(path) => {
let config_folder = path.join(format!(".{}", package_name));
let config_folder = {
// The project started with $HOME path to save the config file. In order the requests
// to use $XDG_CACHE_HOME and keep backward compatibility if the folder $HOME/.shellform exists
// shillfirm continue work with that folder. If the folder does not exists, the default use config dir
let homedir = path.join(format!(".{}", package_name));
let confdir = dirs::config_dir().unwrap_or_else(|| homedir.clone());
if homedir.is_dir() {
homedir
} else {
confdir.join(package_name)
}
};

let setting_config = Config {
latest_version: env!("CARGO_PKG_VERSION").to_string(),
all_checks,
path: config_folder.to_str().unwrap_or("").to_string(),
path: config_folder.display().to_string(),
config_file_path: config_folder
.join("config.yaml")
.to_str()
Expand Down