Merge 48e40a6346 into 194f8e31e4

This commit updates the fish init script to support the upcoming 4.1.x
release of Fish by using `status get-file`.

Fixes #1045

README.md

@@ -12,7 +12,7 @@
 <sup>Special thanks to:</sup>
 
 <!-- markdownlint-disable-next-line MD013 -->
-<div><img alt="Sponsored by Warp" width="230" src="https://raw.githubusercontent.com/warpdotdev/brand-assets/refs/heads/main/Github/Sponsor/Warp-Github-LG-03.png" /></div>
+<div><a href="https://go.warp.dev/zoxide"><img alt="Sponsored by Warp" width="230" src="https://raw.githubusercontent.com/warpdotdev/brand-assets/refs/heads/main/Github/Sponsor/Warp-Github-LG-03.png" /></a></div>
 <div><sup><b>Warp, built for coding with multiple AI agents.</b></sup></div>
 <div><sup>Available for macOS, Linux, and Windows.</sup></div>
 <div><sup>

templates/fish.txt

@@ -19,7 +19,11 @@ end
 # A copy of fish's internal cd function. This makes it possible to use
 # `alias cd=z` without causing an infinite loop.
 if ! builtin functions --query __zoxide_cd_internal
-    string replace --regex -- '^function cd\s' 'function __zoxide_cd_internal ' <$__fish_data_dir/functions/cd.fish | source
+    if status list-files functions/cd.fish &>/dev/null
+        status get-file functions/cd.fish | string replace --regex -- '^function cd\s' 'function __zoxide_cd_internal ' | source
+    else
+        string replace --regex -- '^function cd\s' 'function __zoxide_cd_internal ' <$__fish_data_dir/functions/cd.fish | source
+    end
 end
 
 # cd + custom logic based on the value of _ZO_ECHO.