From 27f49b9523ffa7d17c52b39fd5e14c277c7f628b Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 23 Oct 2025 18:40:13 +0200
Subject: [PATCH] __fish_macos_set_env: extract function to make it testable

---
 share/config.fish                         | 26 -----------------------
 share/functions/__fish_macos_set_env.fish | 26 +++++++++++++++++++++++
 tests/checks/__fish_macos_set_env.fish    | 16 ++++++++++++++
 3 files changed, 42 insertions(+), 26 deletions(-)
 create mode 100644 share/functions/__fish_macos_set_env.fish
 create mode 100644 tests/checks/__fish_macos_set_env.fish

diff --git a/share/config.fish b/share/config.fish
index 893336f21..215a2dc33 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -158,32 +158,6 @@ and __fish_set_locale
 #
 if status --is-login
     if command -sq /usr/libexec/path_helper
-        # Adapt construct_path from the macOS /usr/libexec/path_helper
-        # executable for fish; see
-        # https://opensource.apple.com/source/shell_cmds/shell_cmds-203/path_helper/path_helper.c.auto.html .
-        function __fish_macos_set_env -d "set an environment variable like path_helper does (macOS only)"
-            set -l result
-
-            # Populate path according to config files
-            for path_file in $argv[2] $argv[3]/*
-                for entry in (string split : <? $path_file)
-                    if not contains -- $entry $result
-                        test -n "$entry"
-                        and set -a result $entry
-                    end
-                end
-            end
-
-            # Merge in any existing path elements
-            for existing_entry in $$argv[1]
-                if not contains -- $existing_entry $result
-                    set -a result $existing_entry
-                end
-            end
-
-            set -xg $argv[1] $result
-        end
-
         __fish_macos_set_env PATH /etc/paths '/etc/paths.d'
         if test -n "$MANPATH"
             __fish_macos_set_env MANPATH /etc/manpaths '/etc/manpaths.d'
diff --git a/share/functions/__fish_macos_set_env.fish b/share/functions/__fish_macos_set_env.fish
new file mode 100644
index 000000000..1d36d6470
--- /dev/null
+++ b/share/functions/__fish_macos_set_env.fish
@@ -0,0 +1,26 @@
+# localization: tier1
+# Adapt construct_path from the macOS /usr/libexec/path_helper
+# executable for fish; see
+# https://opensource.apple.com/source/shell_cmds/shell_cmds-203/path_helper/path_helper.c.auto.html .
+function __fish_macos_set_env -d "set an environment variable like path_helper does (macOS only)"
+    set -l result
+
+    # Populate path according to config files
+    for path_file in $argv[2] $argv[3]/*
+        for entry in (string split : <? $path_file)
+            if not contains -- $entry $result
+                test -n "$entry"
+                and set -a result $entry
+            end
+        end
+    end
+
+    # Merge in any existing path elements
+    for existing_entry in $$argv[1]
+        if not contains -- $existing_entry $result
+            set -a result $existing_entry
+        end
+    end
+
+    set -xg $argv[1] $result
+end
diff --git a/tests/checks/__fish_macos_set_env.fish b/tests/checks/__fish_macos_set_env.fish
new file mode 100644
index 000000000..2e113ae47
--- /dev/null
+++ b/tests/checks/__fish_macos_set_env.fish
@@ -0,0 +1,16 @@
+# RUN: %fish %s
+
+mkdir etc
+{
+    echo /usr/share/man
+    echo /usr/local/share/man
+} >etc/manpaths
+mkdir etc/manpaths.d
+
+MANPATH=:/custom/man-path \
+    __fish_macos_set_env MANPATH etc/manpaths etc/manpaths.d
+string join \n entry=$MANPATH
+# CHECK: entry=/usr/share/man
+# CHECK: entry=/usr/local/share/man
+# CHECK: entry=
+# CHECK: entry=/Applications/Ghostty.app/Contents/Resources/ghostty/../man