Add support for ~/.config/pijul even on macos
[?]
Dec 1, 2020, 7:01 PM
IUGP6ZGBFLDRAKJOHFQNG67LZBDXUJ4QM25GOY3QT6GER3NVTHXQCDependencies
- [2]
SXEYMYF7Fixing the bad changes in history (unfortunately, by rebooting). - [3]
SEWGHUHQ.pijul/config: simplify remotes and hooks - [4]
L4JXJHWXpijul/*: reorganize imports and remove extern crate
Change contents
- edit in pijul/src/config.rs at line 1
use crate::Error; - replacement in pijul/src/config.rs at line 20
let s = std::fs::read(&dir);let s = match s {Ok(s) => s,Err(e) => {let s = std::fs::read(&dir).or_else(|e| {// Read from `$HOME/.config/pijul` dirif let Some(mut dir) = dirs_next::home_dir() {dir.push(".config");dir.push(CONFIG_DIR);dir.push("config.toml");std::fs::read(&dir)} else {Err(e.into())}}).or_else(|e| {// Read from `$HOME/.pijulconfig` - replacement in pijul/src/config.rs at line 36
std::fs::read(&dir)?std::fs::read(&dir) - replacement in pijul/src/config.rs at line 38
return Err(e.into());Err(e.into()) - replacement in pijul/src/config.rs at line 40
}};})?; - replacement in pijul/src/config.rs at line 42
if let Ok(c) = toml::from_slice(&s) {Ok(c)} else {Err((crate::Error::CouldNotReadConfig { path: dir }).into())}toml::from_slice(&s).map_err(|_| Error::CouldNotReadConfig { path: dir }.into()) - replacement in pijul/src/config.rs at line 44
Err(crate::Error::NoGlobalConfigDir.into())Err(Error::NoGlobalConfigDir.into())