From e8c5f7a97523be5c14d98894a2c29d8965993a78 Mon Sep 17 00:00:00 2001
From: Ajeet D'Souza <98ajeet@gmail.com>
Date: Thu, 8 Dec 2022 23:24:43 +0530
Subject: [PATCH] Upgrade Nushell to v0.73.0 (#495)

---
 CHANGELOG.md           | 1 +
 README.md              | 4 ++--
 man/man1/zoxide-init.1 | 4 ++--
 templates/nushell.txt  | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c765038..c6c5e3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fzf: 'invalid option' on macOS.
 - PowerShell: handle UTF-8 encoding correctly.
 - Zsh: don't hide output from `chpwd` hooks.
+- Nushell: upgrade minimum supported version to v0.73.0.
 
 ## [0.8.3] - 2022-09-02
 
diff --git a/README.md b/README.md
index 660b13f..2d65d42 100644
--- a/README.md
+++ b/README.md
@@ -204,7 +204,7 @@ zoxide init fish | source
 Add this to your env file (find it by running `$nu.env-path` in Nushell):
 
 ```sh
-zoxide init nushell | save ~/.zoxide.nu
+zoxide init nushell | save -f ~/.zoxide.nu
 ```
 
 Now, add this to the end of your config file (find it by running
@@ -215,7 +215,7 @@ source ~/.zoxide.nu
 ```
 
 > **Note**
-> zoxide only supports Nushell v0.63.0 and above.
+> zoxide only supports Nushell v0.73.0 and above.
 
 </details>
 
diff --git a/man/man1/zoxide-init.1 b/man/man1/zoxide-init.1
index 996e72c..0d7f51b 100644
--- a/man/man1/zoxide-init.1
+++ b/man/man1/zoxide-init.1
@@ -35,7 +35,7 @@ Note: zoxide only supports fish v3.4.0 and above.
 Add this to your env file (find it by running \fB$nu.env-path\fR in Nushell):
 .sp
 .nf
-    \fBzoxide init nushell --hook prompt | save ~/.zoxide.nu\fR
+    \fBzoxide init nushell --hook prompt | save -f ~/.zoxide.nu\fR
 .fi
 .sp
 Now, add this to the end of your config file (find it by running
@@ -45,7 +45,7 @@ Now, add this to the end of your config file (find it by running
     \fBsource ~/.zoxide.nu\fR
 .fi
 .sp
-Note: zoxide only supports Nushell v0.63.0 and above.
+Note: zoxide only supports Nushell v0.73.0 and above.
 .TP
 .B powershell
 Add this to your configuration (find it by running \fBecho $profile\fR in
diff --git a/templates/nushell.txt b/templates/nushell.txt
index 7576e6c..df39c29 100644
--- a/templates/nushell.txt
+++ b/templates/nushell.txt
@@ -39,7 +39,7 @@ let-env config = ($env.config | update hooks.env_change.PWD ($env.config.hooks.e
 def-env __zoxide_z [...rest:string] {
   # `z -` does not work yet, see https://github.com/nushell/nushell/issues/4769
   let arg0 = ($rest | append '~').0
-  let path = if (($rest | length) <= 1) && ($arg0 == '-' || ($arg0 | path expand | path type) == dir) {
+  let path = if (($rest | length) <= 1) and ($arg0 == '-' or ($arg0 | path expand | path type) == dir) {
     $arg0
   } else {
     (zoxide query --exclude $env.PWD -- $rest | str trim -r -c "\n")
@@ -77,11 +77,11 @@ alias {{cmd}}i = __zoxide_zi
 {{ section }}
 # Add this to your env file (find it by running `$nu.env-path` in Nushell):
 #
-#   zoxide init nushell --hook prompt | save ~/.zoxide.nu
+#   zoxide init nushell --hook prompt | save -f ~/.zoxide.nu
 #
 # Now, add this to the end of your config file (find it by running
 # `$nu.config-path` in Nushell):
 #
 #   source ~/.zoxide.nu
 #
-# Note: zoxide only supports Nushell v0.63.0 and above.
+# Note: zoxide only supports Nushell v0.73.0 and above.