From 0986163d9d7f4ee4d3f499ae976ef669193eb842 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Fri, 19 Feb 2021 01:25:40 -0500 Subject: respect TMPDIR for the fallback runtime dir --- CHANGELOG.md | 6 ++++++ src/dirs.rs | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cdab14..6dd5e7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [Unreleased] + +### Fixed + +* Stop hardcoding /tmp when using the fallback runtime directory (#37, pschmitt) + ## [0.5.2] - 2020-12-02 ### Fixed diff --git a/src/dirs.rs b/src/dirs.rs index 16ce29a..cde00e3 100644 --- a/src/dirs.rs +++ b/src/dirs.rs @@ -73,6 +73,11 @@ fn runtime_dir() -> std::path::PathBuf { let project_dirs = directories::ProjectDirs::from("", "", "rbw").unwrap(); match project_dirs.runtime_dir() { Some(dir) => dir.to_path_buf(), - None => format!("/tmp/rbw-{}", nix::unistd::getuid().as_raw()).into(), + None => format!( + "{}/rbw-{}", + std::env::temp_dir().to_string_lossy(), + nix::unistd::getuid().as_raw() + ) + .into(), } } -- cgit v1.2.3-54-g00ecf