From 0d5fd181be3e054e38cc07c365560fac8d3801bc Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 13 Oct 2025 23:09:08 +0200
Subject: [PATCH] tests/fish_config: share logic between standalone and
 installed builds

---
 share/functions/__fish_data_with_file.fish | 3 +--
 tests/checks/fish_config.fish              | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/share/functions/__fish_data_with_file.fish b/share/functions/__fish_data_with_file.fish
index 11feb8c68..3d3313c80 100644
--- a/share/functions/__fish_data_with_file.fish
+++ b/share/functions/__fish_data_with_file.fish
@@ -4,8 +4,7 @@ function __fish_data_with_file
     set -l cmd $argv[2..]
     if set -q __fish_data_dir[1]
         if not string match -rq -- ^/ $path
-            echo >&2 "error: $(status function) requires absolute paths on non-embedded builds"
-            return 1
+            set path $__fish_data_dir/$path
         end
         $cmd $path
     else
diff --git a/tests/checks/fish_config.fish b/tests/checks/fish_config.fish
index dae04bbec..3a1762296 100644
--- a/tests/checks/fish_config.fish
+++ b/tests/checks/fish_config.fish
@@ -126,10 +126,8 @@ fish_config theme show | grep -E 'fish default|Default Dark|custom-from-userconf
 # CHECK: {{.*}}fish default{{\x1b\[m}}
 
 # Override a default theme with different colors.
-{
-    status get-file tools/web_config/themes/None.theme 2>/dev/null ||
-    cat $__fish_data_dir/tools/web_config/themes/None.theme
-} >$__fish_config_dir/themes/"fish default.theme"
+__fish_data_with_file tools/web_config/themes/None.theme \
+    cat >$__fish_config_dir/themes/"fish default.theme"
 fish_config theme show | grep -E 'fish default|Base16 Default Dark' -A1
 # CHECK: {{\x1b\[m}}{{\x1b\[4m}}fish default{{\x1b\[m}}
 # CHECK: {{\x1b\[m}}/bright/vixens{{\x1b\[m}} {{\x1b\[m}}jump{{\x1b\[m}}{{.*}}