From: Max Schillinger <maxschillinger@web.de>
Date: Sun, 26 Sep 2021 21:17:51 +0000 (+0200)
Subject: Combine assignment of $_Z_DATA, $Z_DATA or $HOME/.z
X-Git-Tag: v4.3~3^2
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=1c9ecd781c9df42fd51dada39a3311d09794ec8c;p=nnn.git

Combine assignment of $_Z_DATA, $Z_DATA or $HOME/.z

Co-authored-by: luukvbaal <31730729+luukvbaal@users.noreply.github.com>
---

diff --git a/plugins/autojump b/plugins/autojump
index 50e2a81c..21a28ea8 100755
--- a/plugins/autojump
+++ b/plugins/autojump
@@ -43,8 +43,7 @@ elif type zoxide >/dev/null 2>&1; then
     fi
 else
     # rupa/z uses $_Z_DATA, jethrokuan/z (=port of z for fish) uses $Z_DATA
-    datafile="${_Z_DATA:-$Z_DATA}"
-    datafile="${datafile:-$HOME/.z}"
+    datafile="${_Z_DATA:-${Z_DATA:-$HOME/.z}}"
     if type fzf >/dev/null 2>&1 && [ -f "$datafile" ]; then
         # Read the data from z's file instead of calling
         # z so the data doesn't need to be processed twice