Merge pull request 'fix(zoxide): restore CDPATH support in cd/z execution' (#14) from fix/cdpath-cd-execution into main

Reviewed-on: #14
2026-05-12 04:45:47 +00:00
parent d2e7c799c4 05139354cf
commit be051daf1e
1 changed files with 19 additions and 4 deletions
@@ -33,13 +33,28 @@ if status is-interactive
                _zoxide_cd $HOME
            else if test "$argv" = -
                _zoxide_cd -
-            else if test -d $argv[-1]
+            else
+                # Check if the argument is a directory (respecting CDPATH)
+                set -l is_dir 1
+                if test -d $argv[-1]
+                    set is_dir 0
+                else if not string match -rq '^\.?\.?/' -- $argv[-1]
+                    for i in $CDPATH
+                        if test -n "$i" -a -d "$i/$argv[-1]"
+                            set is_dir 0
+                            break
+                        end
+                    end
+                end
+
+                if test $is_dir -eq 0
                    _zoxide_cd $argv[-1]
                else
-                set -l result (command zoxide query $argv)
+                    set -l result (command zoxide query -- $argv)
                    and _zoxide_cd $result
                end
            end
+        end

        function zi
            set -l result (command zoxide query -i -- $argv)