Add support for ~/.config/pijul even on macos

[?]
Dec 1, 2020, 7:01 PM
IUGP6ZGBFLDRAKJOHFQNG67LZBDXUJ4QM25GOY3QT6GER3NVTHXQC

Dependencies

  • [2] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
  • [3] L4JXJHWX pijul/*: reorganize imports and remove extern crate
  • [4] SEWGHUHQ .pijul/config: simplify remotes and hooks

Change contents

  • edit in pijul/src/config.rs at line 1
    [2.89866]
    [2.89867]
    use crate::Error;
  • replacement in pijul/src/config.rs at line 20
    [2.90243][2.90243:90370]()
    let s = std::fs::read(&dir);
    let s = match s {
    Ok(s) => s,
    Err(e) => {
    [2.90243]
    [2.90370]
    let s = std::fs::read(&dir)
    .or_else(|e| {
    // Read from `$HOME/.config/pijul` dir
    if 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
    [2.90487][2.90487:90532]()
    std::fs::read(&dir)?
    [2.90487]
    [2.90532]
    std::fs::read(&dir)
  • replacement in pijul/src/config.rs at line 38
    [2.90561][2.90561:90607]()
    return Err(e.into());
    [2.90561]
    [2.90607]
    Err(e.into())
  • replacement in pijul/src/config.rs at line 40
    [2.90629][2.90629:90662]()
    }
    };
    [2.90629]
    [2.90662]
    })?;
  • replacement in pijul/src/config.rs at line 42
    [2.90697][2.90697:90881]()
    if let Ok(c) = toml::from_slice(&s) {
    Ok(c)
    } else {
    Err((crate::Error::CouldNotReadConfig { path: dir }).into())
    }
    [2.90697]
    [2.90881]
    toml::from_slice(&s).map_err(|_| Error::CouldNotReadConfig { path: dir }.into())
  • replacement in pijul/src/config.rs at line 44
    [2.90898][2.90898:90954]()
    Err(crate::Error::NoGlobalConfigDir.into())
    [2.90898]
    [2.90954]
    Err(Error::NoGlobalConfigDir.into())