From 45765f4e00247102dadf5c8a9ace1d56c3745217 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 4 Jun 2026 10:54:14 +0800
Subject: [PATCH] env_init: minor refactoring for initializating user path vars

---
 src/env/environment.rs | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/env/environment.rs b/src/env/environment.rs
index d4addf78b..096b73ca3 100644
--- a/src/env/environment.rs
+++ b/src/env/environment.rs
@@ -625,23 +625,14 @@ pub fn env_init(paths: Option<&ConfigPaths>, do_uvars: bool, default_paths: bool
         set_path(FISH_HELPDIR_VAR, paths.doc.as_ref());
     }
 
-    vars.set_one(
-        FISH_CONFIG_DIR,
-        global_mode,
-        path_get_config().path.to_owned(),
-    );
+    for (varname, validated_path) in [
+        (FISH_CACHE_DIR, path_get_cache()),
+        (FISH_CONFIG_DIR, path_get_config()),
+        (FISH_USER_DATA_DIR, path_get_data()),
+    ] {
+        vars.set_one(varname, global_mode, validated_path.path.to_owned());
+    }
 
-    vars.set_one(
-        FISH_USER_DATA_DIR,
-        global_mode,
-        path_get_data().path.to_owned(),
-    );
-
-    vars.set_one(
-        FISH_CACHE_DIR,
-        global_mode,
-        path_get_cache().path.to_owned(),
-    );
     // Set up a default PATH
     setup_path(global_exported_mode);