feat: Allow for both .config and standard ~/Library/... dir on mac

elkowar · Dec 22, 2024 · ab5e155 · ab5e155
1 parent 2356918
commit ab5e155
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/src/script/sysinfo.rs b/src/script/sysinfo.rs
@@ -29,8 +29,6 @@ pub struct SystemInfoPaths {
     config_dir: PathBuf,
     #[rhai_type(readonly)]
     home_dir: PathBuf,
-    #[rhai_type(readonly)]
-    yolk_dir: PathBuf,
 }
 
 impl SystemInfo {
@@ -50,7 +48,6 @@ impl SystemInfo {
                 cache_dir: dirs::cache_dir().unwrap_or_else(|| "unknown".into()),
                 config_dir: dirs::config_dir().unwrap_or_else(|| "unknown".into()),
                 home_dir: dirs::home_dir().unwrap_or_else(|| "unknown".into()),
-                yolk_dir: crate::yolk_paths::default_yolk_dir(),
             },
         }
     }
@@ -63,7 +60,6 @@ impl SystemInfo {
                 cache_dir: (PathBuf::from("/canonical/cache")),
                 config_dir: (PathBuf::from("/canonical/config")),
                 home_dir: (PathBuf::from("/canonical/home")),
-                yolk_dir: PathBuf::from("/canonical/yolk"),
             },
             distro: "distro".to_string(),
             device_name: "devicename".to_string(),

diff --git a/src/util.rs b/src/util.rs
@@ -4,6 +4,8 @@ use cached::UnboundCache;
 use miette::{Context as _, IntoDiagnostic as _};
 use regex::Regex;
 
+use crate::yolk_paths::default_yolk_dir;
+
 /// Rename or move a file, but only if the destination doesn't exist.
 /// This is a safer verison of [`std::fs::rename`] that doesn't overwrite files.
 pub fn rename_safely(original: impl AsRef<Path>, new: impl AsRef<Path>) -> miette::Result<()> {
@@ -58,11 +60,9 @@ impl Path {
     ///
     /// This replaces the home path with `~`, as well as reducing paths that point into the eggs directory to `eggs/rest/of/path`.
     fn abbr(&self) -> String {
-        match (
-            dirs::home_dir(),
-            dirs::config_dir().map(|x| x.join("yolk").join("eggs")),
-        ) {
-            (Some(home), Some(eggs)) => self
+        let eggs = default_yolk_dir().join("eggs");
+        match dirs::home_dir() {
+            Some(home) => self
                 .strip_prefix(&eggs)
                 .map(|x| PathBuf::from("eggs").join(x))
                 .or_else(|_| self.strip_prefix(&home).map(|x| PathBuf::from("~").join(x)))

diff --git a/src/yolk_paths.rs b/src/yolk_paths.rs
@@ -31,9 +31,21 @@ pub struct YolkPaths {
 }
 
 pub fn default_yolk_dir() -> PathBuf {
-    dirs::config_dir()
+    let standard_dir = dirs::config_dir()
         .expect("No config dir available")
-        .join("yolk")
+        .join("yolk");
+    if standard_dir.exists() {
+        standard_dir
+    } else {
+        let config_dir = if let Ok(config_dir) = std::env::var("XDG_CONFIG_DIR") {
+            PathBuf::from(config_dir)
+        } else {
+            dirs::home_dir()
+                .expect("No home dir available")
+                .join(".config")
+        };
+        config_dir.join("yolk")
+    }
 }
 
 impl YolkPaths {