Merge 227997e516 into 67ca1bc959

2026-03-25 23:01:27 -04:00 · 2026-03-25 23:01:27 -04:00 · 8fe5f48726
parent 67ca1bc959 227997e516
commit 8fe5f48726
21 changed files with 186 additions and 40 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@ -1,6 +1,3 @@
-[alias]
-xtask = "run --package xtask --"
-
 # On Windows MSVC, statically link the C runtime so that the resulting EXE does
 # not depend on the vcruntime DLL.
 [target.'cfg(all(windows, target_env = "msvc"))']
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,16 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{md,rst,txt}]
+indent_size = unset
+trim_trailing_whitespace = false
+
+[*.{nix,ts,yml}]
+indent_size = 2
--- a/.gitattributes
+++ b/.gitattributes
@ -1,5 +1,4 @@
-/contrib/completions/* eol=lf linguist-generated=true text
-/contrib/completions/README.md -eol -linguist-generated -text
-/init.fish eol=lf text
-/templates/*.txt eol=lf text
-/zoxide.plugin.zsh eol=lf text
+* text=auto eol=lf
+
+/contrib/completions/**         linguist-generated
+/contrib/completions/README.md -linguist-generated
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added

 - POSIX: support for non-Cygwin Windows environments (e.g. Busybox).
+- Support for `cmd.exe` (experimental).

 ### Fixed

--- a/Cargo.toml
+++ b/Cargo.toml
@ -25,7 +25,7 @@ bincode = "1.3.1"
 clap = { version = "4.3.0", features = ["derive"] }
 color-print = "0.3.4"
 dirs = "6.0.0"
-dunce = "1.0.1"
+dunce = "1.0.4"
 fastrand = "2.0.0"
 glob = "0.3.0"
 ouroboros = "0.18.3"
--- a/README.md
+++ b/README.md
@ -148,9 +148,6 @@ zoxide can be installed in 4 easy steps:
   <details>
   <summary>Windows</summary>

-   > zoxide works with PowerShell, as well as shells running in Cygwin, Git
-   > Bash, and MSYS2.
-   >
   > The recommended way to install zoxide is via `winget`:
   >
   > ```sh
@ -226,6 +223,18 @@ zoxide can be installed in 4 easy steps:

   </details>

+   <details>
+   <summary><code>cmd.exe</code></summary>
+
+   > Add this to the <ins>**end**</ins> of your config file or AutoRun command
+   > (usually `HKEY_CURRENT_USER\Software\Microsoft\Command Processor\AutoRun`):
+   >
+   > ```batchfile
+   > zoxide init cmd | cmd /d/q/k echo off
+   > ```
+
+   </details>
+
   <details>
   <summary>Elvish</summary>

@ -415,7 +424,7 @@ When calling `zoxide init`, the following flags are available:
 - `--cmd`
  - Changes the prefix of the `z` and `zi` commands.
  - `--cmd j` would change the commands to (`j`, `ji`).
-  - `--cmd cd` would replace the `cd` command.
+  - `--cmd cd` would replace the `cd` command (highly recommended on `cmd.exe`).
 - `--hook <HOOK>`
  - Changes how often zoxide increments a directory's score:

@ -427,8 +436,8 @@ When calling `zoxide init`, the following flags are available:

 - `--no-cmd`
  - Prevents zoxide from defining the `z` and `zi` commands.
-  - These functions will still be available in your shell as `__zoxide_z` and
-    `__zoxide_zi`, should you choose to redefine them.
+  - These functions will still be available in your shell (not on `cmd.exe`)
+    as `__zoxide_z` and `__zoxide_zi`, should you choose to redefine them.

 ### Environment variables

@ -446,17 +455,16 @@ Environment variables[^2] can be used for configuration. They must be set before
    | Windows     | `%LOCALAPPDATA%`                         | `C:\Users\Alice\AppData\Local`             |

 - `_ZO_ECHO`
-  - When set to 1, `z` will print the matched directory before navigating to
-    it.
+  - When set to 1, `z` will print the matched directory after navigating to it.
 - `_ZO_EXCLUDE_DIRS`
  - Excludes the specified directories from the database.
  - This is provided as a list of [globs][glob], separated by OS-specific
    characters:

-    | OS                  | Separator | Example                 |
-    | ------------------- | --------- | ----------------------- |
-    | Linux / macOS / BSD | `:`       | `$HOME:$HOME/private/*` |
-    | Windows             | `;`       | `$HOME;$HOME/private/*` |
+    | OS                  | Separator | Example                   |
+    | ------------------- | --------- | ------------------------- |
+    | Linux / macOS / BSD | `:`       | `$HOME:$HOME/private/*`   |
+    | Windows             | `;`       | `%HOME%;%HOME%/private/*` |

  - By default, this is set to `"$HOME"`.
 - `_ZO_FZF_OPTS`
--- a/contrib/completions/_zoxide
+++ b/contrib/completions/_zoxide
@ -114,7 +114,7 @@ _arguments "${_arguments_options[@]}" : \
 '--help[Print help]' \
 '-V[Print version]' \
 '--version[Print version]' \
-':shell:(bash elvish fish nushell posix powershell tcsh xonsh zsh)' \
+':shell:(bash cmd elvish fish nushell posix powershell tcsh xonsh zsh)' \
 && ret=0
 ;;
 (query)
--- a/contrib/completions/zoxide.bash
+++ b/contrib/completions/zoxide.bash
@ -177,7 +177,7 @@ _zoxide() {
            return 0
            ;;
        zoxide__init)
-            opts="-h -V --no-cmd --cmd --hook --help --version bash elvish fish nushell posix powershell tcsh xonsh zsh"
+            opts="-h -V --no-cmd --cmd --hook --help --version bash cmd elvish fish nushell posix powershell tcsh xonsh zsh"
            if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                return 0
--- a/contrib/completions/zoxide.nu
+++ b/contrib/completions/zoxide.nu
@ -57,7 +57,7 @@ module completions {
  ]

  def "nu-complete zoxide init shell" [] {
-    [ "bash" "elvish" "fish" "nushell" "posix" "powershell" "tcsh" "xonsh" "zsh" ]
+    [ "bash" "cmd" "elvish" "fish" "nushell" "posix" "powershell" "tcsh" "xonsh" "zsh" ]
  }

  def "nu-complete zoxide init hook" [] {
--- a/contrib/completions/zoxide.ts
+++ b/contrib/completions/zoxide.ts
@ -189,6 +189,7 @@ const completion: Fig.Spec = {
        name: "shell",
        suggestions: [
          "bash",
+          "cmd",
          "elvish",
          "fish",
          "nushell",
--- a/man/man1/zoxide-init.1
+++ b/man/man1/zoxide-init.1
@ -13,6 +13,14 @@ Add this to the \fBend\fR of your config file (usually \fB~/.bashrc\fR):
    \fBeval "$(zoxide init bash)"\fR
 .fi
 .TP
+.B cmd.exe
+Add this to the \fBend\fR of your config file or AutoRun command (usually
+\fBHKEY_CURRENT_USER\\Software\\Microsoft\\Command Processor\\AutoRun\fR):
+.sp
+.nf
+    \fBzoxide init cmd | cmd /d/q/k echo off\fR
+.fi
+.TP
 .B elvish
 Add this to the \fBend\fR of your config file (usually \fB~/.elvish/rc.elv\fR):
 .sp
@ -91,8 +99,8 @@ Changes the prefix of the \fBz\fR and \fBzi\fR commands.
 .br
 \fB--cmd j\fR would change the commands to (\fBj\fR, \fBji\fR).
 .br
-\fB--cmd cd\fR would replace the \fBcd\fR command (doesn't work on Nushell /
-POSIX shells).
+\fB--cmd cd\fR would replace the \fBcd\fR command (highly recommended on
+\fBcmd.exe\fR).
 .TP
 .B -h, --help
 Print help information.
@ -109,8 +117,8 @@ l l.
 .TP
 .B --no-cmd
 Prevents zoxide from defining the \fBz\fR and \fBzi\fR commands. These functions
-will still be available in your shell as \fB__zoxide_z\fR and \fB__zoxide_zi\fR,
-should you choose to redefine them.
+will still be available in your shell (not on \fBcmd.exe\fR) as \fB__zoxide_z\fR
+and \fB__zoxide_zi\fR, should you choose to redefine them.
 .SH REPORTING BUGS
 For any issues, feature requests, or questions, please visit:
 .sp
--- a/man/man1/zoxide.1
+++ b/man/man1/zoxide.1
@ -70,7 +70,7 @@ T}
 .TE
 .TP
 .B _ZO_ECHO
-When set to 1, \fBz\fR will print the matched directory before navigating to it.
+When set to 1, \fBz\fR will print the matched directory after navigating to it.
 .TP
 .B _ZO_EXCLUDE_DIRS
 Prevents the specified directories from being added to the database. This is
@ -82,7 +82,7 @@ l l.
    \fBLinux/macOS/BSD\fR|T{
 \fB:\fR, eg. \fB$HOME:$HOME/private/*\fR
 T}
-    \fBWindows\fR|\fB;\fR, eg. \fB$HOME;$HOME/private/*\fR
+    \fBWindows\fR|\fB;\fR, eg. \fB%HOME%;%HOME%/private/*\fR
 .TE
 .sp
 By default, this is set to \fB$HOME\fR. After setting this up, you might need
--- a/rustfmt.toml
+++ b/rustfmt.toml
@ -1,6 +1,6 @@
 group_imports = "StdExternalCrate"
 imports_granularity = "Module"
-newline_style = "Native"
+newline_style = "Unix"
 use_field_init_shorthand = true
 use_small_heuristics = "Max"
 use_try_shorthand = true
--- a/src/cmd/cmd.rs
+++ b/src/cmd/cmd.rs
@ -147,6 +147,7 @@ pub enum InitHook {
 #[derive(ValueEnum, Clone, Debug)]
 pub enum InitShell {
    Bash,
+    Cmd,
    Elvish,
    Fish,
    Nushell,
--- a/src/cmd/init.rs
+++ b/src/cmd/init.rs
@ -6,7 +6,7 @@ use askama::Template;
 use crate::cmd::{Init, InitShell, Run};
 use crate::config;
 use crate::error::BrokenPipeHandler;
-use crate::shell::{Bash, Elvish, Fish, Nushell, Opts, Posix, Powershell, Tcsh, Xonsh, Zsh};
+use crate::shell::{Bash, Cmd, Elvish, Fish, Nushell, Opts, Posix, Powershell, Tcsh, Xonsh, Zsh};

 impl Run for Init {
    fn run(&self) -> Result<()> {
@ -17,6 +17,7 @@ impl Run for Init {

        let source = match self.shell {
            InitShell::Bash => Bash(opts).render(),
+            InitShell::Cmd => Cmd(opts).render(),
            InitShell::Elvish => Elvish(opts).render(),
            InitShell::Fish => Fish(opts).render(),
            InitShell::Nushell => Nushell(opts).render(),
--- a/src/main.rs
+++ b/src/main.rs
@ -1,5 +1,3 @@
-#![allow(clippy::single_component_path_imports)]
-
 mod cmd;
 mod config;
 mod db;
--- a/src/shell.rs
+++ b/src/shell.rs
@ -11,7 +11,7 @@ pub struct Opts<'a> {
 macro_rules! make_template {
    ($name:ident, $path:expr) => {
        #[derive(::std::fmt::Debug, ::askama::Template)]
-        #[template(path = $path)]
+        #[template(path = $path, escape = "none")]
        pub struct $name<'a>(pub &'a self::Opts<'a>);

        impl<'a> ::std::ops::Deref for $name<'a> {
@ -24,6 +24,7 @@ macro_rules! make_template {
 }

 make_template!(Bash, "bash.txt");
+make_template!(Cmd, "cmd.txt");
 make_template!(Elvish, "elvish.txt");
 make_template!(Fish, "fish.txt");
 make_template!(Nushell, "nushell.txt");
@ -54,6 +55,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn bash_bash(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Bash(&opts).render().unwrap();
@ -66,6 +68,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn bash_shellcheck(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Bash(&opts).render().unwrap();
@ -80,6 +83,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn bash_shfmt(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let mut source = Bash(&opts).render().unwrap();
@ -95,6 +99,45 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(windows)]
+    fn cmd_cmd(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
+        let opts = Opts { cmd, hook, echo, resolve_symlinks };
+        let source = Cmd(&opts).render().unwrap();
+
+        let assert = Command::new(which::which("cmd.exe").unwrap())
+            .args(["/x", "/d", "/q", "/k", "echo off"])
+            .env("PROMPT", "")
+            .write_stdin(source)
+            .assert()
+            .success()
+            .stderr("");
+
+        if opts.hook == InitHook::None {
+            assert.stdout("");
+        }
+    }
+
+    #[apply(opts)]
+    #[cfg(windows)]
+    fn cmd_dos(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
+        let opts = Opts { cmd, hook, echo, resolve_symlinks };
+        let source = Cmd(&opts).render().unwrap();
+
+        let assert = Command::new(which::which("cmd.exe").unwrap())
+            .args(["/y", "/d", "/q", "/k", "echo off"])
+            .env("PROMPT", "")
+            .write_stdin(source)
+            .assert()
+            .success()
+            .stderr("");
+
+        if opts.hook == InitHook::None {
+            assert.stdout("");
+        }
+    }
+
+    #[apply(opts)]
+    #[cfg(unix)]
    fn elvish_elvish(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let mut source = String::new();
@ -115,6 +158,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn fish_no_builtin_abbr(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Fish(&opts).render().unwrap();
@ -125,6 +169,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn fish_fish(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Fish(&opts).render().unwrap();
@ -142,6 +187,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn fish_fishindent(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let mut source = Fish(&opts).render().unwrap();
@ -160,6 +206,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn nushell_nushell(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Nushell(&opts).render().unwrap();
@ -180,6 +227,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn posix_bash(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Posix(&opts).render().unwrap();
@ -195,6 +243,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn posix_dash(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Posix(&opts).render().unwrap();
@ -207,6 +256,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn posix_shellcheck(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Posix(&opts).render().unwrap();
@ -221,6 +271,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn posix_shfmt(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let mut source = Posix(&opts).render().unwrap();
@ -236,6 +287,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn powershell_pwsh(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let mut source = "Set-StrictMode -Version latest\n".to_string();
@ -250,6 +302,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn tcsh_tcsh(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Tcsh(&opts).render().unwrap();
@ -264,6 +317,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn xonsh_black(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let mut source = Xonsh(&opts).render().unwrap();
@ -278,6 +332,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn xonsh_mypy(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Xonsh(&opts).render().unwrap();
@ -286,6 +341,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn xonsh_pylint(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let mut source = Xonsh(&opts).render().unwrap();
@ -300,6 +356,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn xonsh_xonsh(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Xonsh(&opts).render().unwrap();
@ -317,6 +374,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn zsh_shellcheck(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Zsh(&opts).render().unwrap();
@ -332,6 +390,7 @@ mod tests {
    }

    #[apply(opts)]
+    #[cfg(unix)]
    fn zsh_zsh(cmd: Option<&str>, hook: InitHook, echo: bool, resolve_symlinks: bool) {
        let opts = Opts { cmd, hook, echo, resolve_symlinks };
        let source = Zsh(&opts).render().unwrap();
--- a/src/util.rs
+++ b/src/util.rs
@ -31,7 +31,7 @@ impl Fzf {
        // Instead, we resolve the path to the executable and then pass it to
        // CreateProcess.
        #[cfg(windows)]
-        let program = which::which("fzf.exe").map_err(|_| anyhow!(Self::ERR_FZF_NOT_FOUND))?;
+        let program = which::which("fzf").map_err(|_| anyhow!(Self::ERR_FZF_NOT_FOUND))?;
        #[cfg(not(windows))]
        let program = "fzf";

--- a/templates/cmd.txt
+++ b/templates/cmd.txt
@ -0,0 +1,58 @@
+{%- let section = "::: ===========================================================================\n:::" -%}
+{%- let not_configured = "::: -- not configured --" -%}
+
+{%- if hook != InitHook::None -%}
+echo zoxide: hooks are not supported on cmd.exe shell.
+echo         Use '%program% init cmd --hook none' instead.
+
+{% endif -%}
+
+@if "%=^%=" == "%=%=" (set \p=%%<nul) else (set \p=^%<nul)
+
+set program=zoxide
+
+set builtin_cd=chdir /d
+set builtin_pwd=(chdir)
+
+::: Get Windows' system directory, like GetSystemDirectoryW.
+@if "" == "%SystemRoot%" (set sysdir="%__APPDIR__%") else (set sysdir="%SystemRoot%\system32\")
+
+{{ section }}
+::: Utility functions for zoxide.
+:::
+
+::: pwd based on the value of _ZO_RESOLVE_SYMLINKS.
+set __zoxide_pwd= {%- if resolve_symlinks -%} (for /f "skip=9 tokens=1,2,*" %\p%j in ('^^^^^^^^"%sysdir%fsutil.exe reparsepoint query .^"') do if "%\p%~j" equ "Print" if "%\p%~k" equ "Name:" if "%\p%~l" neq "" (echo(%\p%~l)) ^^^^^^^|^^^^^^^| {%~ endif -%} %builtin_pwd%
+
+::: cd + custom logic based on the value of _ZO_ECHO.
+set __zoxide_cd=if /i "%\p%CD%\p%" neq "%\p%~fd" (%builtin_cd% "%\p%~fd" ^^^&^^^& set "OLDPWD=%\p%CD%\p%" ^^^&^^^& (for /f "delims=" %\p%l in ('"%builtin_pwd%"') do if /i "%\p%~fl" neq "%\p%~dpl" (%program% add -- "%\p%~fl") else (%program% add -- "%\p%~dpl\")) {%- if echo ~%} ^^^&^^^& %__zoxide_pwd% {%- endif ~%} ^^^&^^^& if defined CDCMD (call %\p%CDCMD%\p%))
+
+{{ section }}
+::: Commands for zoxide. Disable these using --no-cmd.
+:::
+
+{%- match cmd %}
+{%- when Some with (cmd) %}
+
+::: Jump to a directory using only keywords.
+%sysdir%doskey.exe {{ cmd }} = @if not defined _ZO_DOCTOR (echo off) $T for /f "delims=" %\p%s in ('"%sysdir%chcp.com 2>nul"') do for %\p%c in (%\p%~s) do set "_ZO_CODEPAGE=%\p%~nc" $T %sysdir%mode.com con:cp select=65001 ^>nul $T (for %\p%^^^^ in ("") do for /f "delims=" %\p%i in (^^""$*%\p%~^^"^") do if "%\p%~i" equ "" (if "%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%" equ "" (for /f "delims=" %\p%d in (^^""%\p%USERPROFILE%\p%"^") do %__zoxide_cd%) else for /f "delims=" %\p%d in (^^""%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%"^") do %__zoxide_cd%) else if "%\p%~i" equ "~" (if "%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%" equ "" (for /f "delims=" %\p%d in (^^""%\p%USERPROFILE%\p%"^") do %__zoxide_cd%) else for /f "delims=" %\p%d in (^^""%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%"^") do %__zoxide_cd%) else if "%\p%~i" equ "-" (if defined OLDPWD (for /f "delims=" %\p%d in (^^""%\p%OLDPWD%\p%"^") do %__zoxide_cd%) else ^>^&2 (echo(%program%: OLDPWD not set) ^& call) else for /f "delims=" %\p%~ in (^^"%\p%~i^") do for /f "tokens=1,* delims=d" %\p%a in ("-%\p%~a~") do if "%\p%b" neq "" (for /f "delims=" %\p%d in (^^""%\p%~f~"^") do %__zoxide_cd%) else if /i "%\p%CD%\p%" neq "%\p%__CD__%\p%" (for /f "delims=" %\p%q in ('^^"%program% query --exclude "%\p%CD%\p%" -- %\p%~i^"') do (for /f "delims=" %\p%d in (^^""%\p%~fq"^") do %__zoxide_cd%)) else (for /f "delims=" %\p%q in ('^^"%program% query --exclude "%\p%__CD__%\p%\" -- %\p%~i^"') do (for /f "delims=" %\p%d in (^^""%\p%~fq"^") do %__zoxide_cd%))) ^&^& (for /f "delims=" %\p%v in ('"set /a _ZO_CODEPAGE"') do %sysdir%mode.com con:cp select=%\p%~v ^>nul) ^|^| (for /f "delims=" %\p%v in ('"set /a _ZO_CODEPAGE"') do %sysdir%mode.com con:cp select=%\p%~v ^>nul ^& call) $T set "_ZO_CODEPAGE=" ^& echo on
+
+::: Jump to a directory using interactive search.
+%sysdir%doskey.exe {{ cmd }}i = @if not defined _ZO_DOCTOR (echo off) $T for /f "delims=" %\p%s in ('"%sysdir%chcp.com 2>nul"') do for %\p%c in (%\p%~s) do set "_ZO_CODEPAGE=%\p%~nc" $T %sysdir%mode.com con:cp select=65001 ^>nul $T (for %\p%^^^^ in ("") do for /f "delims=" %\p%i in (^^""$*%\p%~^^"^") do for /f "delims=" %\p%p in ('^^"%program% query --interactive -- %\p%~i^"') do for /f "delims=" %\p%d in (^^""%\p%~fp"^") do %__zoxide_cd%) ^&^& (for /f "delims=" %\p%v in ('"set /a _ZO_CODEPAGE"') do %sysdir%mode.com con:cp select=%\p%~v ^>nul) ^|^| (for /f "delims=" %\p%v in ('"set /a _ZO_CODEPAGE"') do %sysdir%mode.com con:cp select=%\p%~v ^>nul ^& call) $T set "_ZO_CODEPAGE=" ^& echo on
+
+{%- when None %}
+
+{{ not_configured }}
+
+{%- endmatch %}
+
+{{ section }}
+::: To initialize zoxide, add this to your configuration or AutoRun command
+::: (usually HKEY_CURRENT_USER\Software\Microsoft\Command Processor\AutoRun):
+:::
+:::   zoxide init cmd | cmd /d/q/k echo off
+
+{#~
+  Content piped to `cmd.exe` needs to end with an empty line to indicate end of
+  input. Removing this will cause extra "More? " to be written to stdout.
+#}
--- a/templates/posix.txt
+++ b/templates/posix.txt
@ -101,8 +101,7 @@ __zoxide_z() {
        if [ -n "${OLDPWD}" ]; then
            __zoxide_cd "${OLDPWD}"
        else
-            # shellcheck disable=SC2016
-            \command printf 'zoxide: $OLDPWD is not set'
+            \command printf 'zoxide: OLDPWD not set'
            return 1
        fi
    elif [ "$#" -eq 1 ] && [ -d "$1" ]; then
--- a/zoxide.plugin.zsh
+++ b/zoxide.plugin.zsh
@ -1,5 +1,5 @@
 if (( $+commands[zoxide] )); then
-  eval "$(zoxide init zsh)"
+    eval "$(zoxide init zsh)"
 else
-  echo 'zoxide: command not found, please install it from https://github.com/ajeetdsouza/zoxide'
+    echo 'zoxide: command not found, please install it from https://github.com/ajeetdsouza/zoxide'
 fi