WIP

Author: mataha

.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,txt}]
+indent_size = unset
+trim_trailing_whitespace = false
+
+[*.{nix,ts,yml,zsh}]
+indent_size = 2

Cargo.lock

@@ -45,8 +45,8 @@ color-print = "0.3.4"
 
 [dev-dependencies]
 assert_cmd = "2.0.0"
-rstest = { version = "0.18.0", default-features = false }
-rstest_reuse = "0.6.0"
+rstest = { version = "0.21.0", default-features = false }
+rstest_reuse = "0.7.0"
 tempfile = "3.1.0"
 
 [features]

Cargo.toml

@@ -223,7 +223,7 @@ zoxide can be installed in 4 easy steps:
    > Add this to the **end** of your config file or AutoRun command:
    >
    > ```batchfile
-   > zoxide init cmd | cmd /d /k >nul
+   > zoxide init cmd --hook none | cmd /d/q/k >nul
    > ```
 
    </details>

README.md

@@ -13,6 +13,13 @@ Add this to the \fBend\fR of your config file (usually \fB~/.bashrc\fR):
     \fBeval "$(zoxide init bash)"\fR
 .fi
 .TP
+.B cmd
+Add this to the \fBend\fR of your config file or AutoRun command:
+.sp
+.nf
+    \fBzoxide init cmd --hook none | cmd /d/q/k >nul\fR
+.fi
+.TP
 .B elvish
 Add this to the \fBend\fR of your config file (usually \fB~/.elvish/rc.elv\fR):
 .sp

man/man1/zoxide-init.1

@@ -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> {
@@ -103,12 +103,17 @@ mod tests {
         let opts = Opts { cmd, hook, echo, resolve_symlinks };
         let source = Cmd(&opts).render().unwrap();
 
-        Command::new("cmd.exe")
-            .args(["/a", "/d", "/e:on", "/q", "/v:off", "/k", "@doskey /macros:cmd.exe"])
+        let assert = Command::new(which::which("cmd.exe").unwrap())
+            .args(["/d", "/x", "/k"])
             .write_stdin(source)
             .assert()
-            .success()
-            .stderr("");
+            .success();
+
+        if opts.hook != InitHook::None {
+            assert.stderr("zoxide: hooks are not supported on cmd shell.\r\n");
+        } else {
+            assert.stderr("");
+        }
     }
 
     #[apply(opts)]
@@ -117,12 +122,17 @@ mod tests {
         let opts = Opts { cmd, hook, echo, resolve_symlinks };
         let source = Cmd(&opts).render().unwrap();
 
-        Command::new("cmd.exe")
-            .args(["/a", "/d", "/e:off", "/q", "/v:off", "/k", "@doskey /macros:cmd.exe"])
+        let assert = Command::new(which::which("cmd.exe").unwrap())
+            .args(["/d", "/y", "/k"])
             .write_stdin(source)
             .assert()
-            .failure()
-            .stderr("zoxide: unable to init with Command Extensions disabled (see `help cmd` for details)");
+            .success();
+
+        if opts.hook != InitHook::None {
+            assert.stderr("zoxide: hooks are not supported on cmd shell.\r\n");
+        } else {
+            assert.stderr("");
+        }
     }
 
     #[apply(opts)]

src/shell.rs

@@ -112,7 +112,7 @@ impl Fzf {
     pub fn spawn(&mut self) -> Result<FzfChild> {
         match self.0.spawn() {
             Ok(child) => Ok(FzfChild(child)),
-            Err(e) if e.kind() == io::ErrorKind::NotFound => bail!(Self::ERR_FZF_NOT_FOUND),
+            Err(e) if e.kind() == io::ErrorKind::NotFound => Err(anyhow!(Self::ERR_FZF_NOT_FOUND)),
             Err(e) => Err(e).context("could not launch fzf"),
         }
     }
@@ -410,38 +410,3 @@ pub fn to_lowercase(s: impl AsRef<str>) -> String {
     let s = s.as_ref();
     if s.is_ascii() { s.to_ascii_lowercase() } else { s.to_lowercase() }
 }
-
-#[cfg(test)]
-#[cfg(windows)]
-mod tests_win {
-    use std::path::PathBuf;
-
-    use rstest::rstest;
-
-    #[rstest]
-    #[case(r"c:\", r"C:\")]
-    #[case(r"C:\", r"C:\")]
-    #[case(r"c:\\.", r"C:\")]
-    #[case(r"c:\..", r"C:\")]
-    #[case(r"C:\.\.", r"C:\")]
-    #[case(r"\\?\C:\", r"C:\")]
-    #[case(r"\\?\c:\", r"C:\")]
-    #[case(r"\\?\C:\\\", r"C:\")]
-    #[case(r"\\?\c:\\.\", r"C:\")]
-    #[case(r"c:\Windows", r"C:\Windows")]
-    #[case(r"C:\WINDOWS", r"C:\WINDOWS")]
-    #[case(r"c:\\\Windows\.", r"C:\Windows")]
-    #[case(r"C:\$WinREAgent", r"C:\$WinREAgent")]
-    #[case(r"\\?\c:\\Windows\\.", r"C:\Windows")]
-    #[case(r"\\?\c:\..\.\windows", r"C:\windows")]
-    #[case(r"c:\Windows\System32\.", r"C:\Windows\System32")]
-    #[case(r"c:\WINDOWS\..\..\Windows", r"C:\Windows")]
-    #[case(r"c:\Windows\..\.\.\..\Temp\..\tmp", r"C:\tmp")]
-    #[case(r"c:\.\Windows\..\..\Program Files", r"C:\Program Files")]
-    #[case(r"\\?\C:\\$WinREAgent\\..\Program Files\.", r"C:\Program Files")]
-    fn resolve_path(#[case] absolute_path: &str, #[case] normalized_form: &str) {
-        let path = PathBuf::from(absolute_path);
-        let resolved_path = super::resolve_path(path).unwrap();
-        assert_eq!(resolved_path.to_str().unwrap(), normalized_form);
-    }
-}