From d446bf51c4eb034361686eac0bba90fd6f595433 Mon Sep 17 00:00:00 2001
From: Rudis Muiznieks <rudis@sitosis.com>
Date: Wed, 19 Mar 2025 09:12:46 -0500
Subject: [PATCH] improved z.sh completion for yash
---
yash/z.sh | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/yash/z.sh b/yash/z.sh
index 9fbfb53..d60db47 100644
--- a/yash/z.sh
+++ b/yash/z.sh
@@ -1,3 +1,6 @@
+# shellcheck shell=sh
+# shellcheck disable=SC2001 disable=SC2034 disable=SC2046 disable=2164
+
JUMP_LIST=~/.config/z/jump_list
_z_exec() {
@@ -14,10 +17,15 @@ function completion/z {
) #<#
command -f completion//parseoptions -n
- if [ -z "$ARGOPT" ] || [ "$ARGOPT" = "r" ]; then
- complete -T $(_z_exec "select alias from jump_list")
- elif [ "$ARGOPT" = "-" ]; then
+ argnum="${WORDS[#]}"
+ if [ "$ARGOPT" = "-" ] && [ "$argnum" -eq 1 ]; then
command -f completion//completeoptions
+ elif [ -z "$ARGOPT" ] && [ "$argnum" -eq 1 ]; then
+ complete -T $(_z_exec "select alias from jump_list")
+ elif [ "$ARGOPT" = "r" ] && [ "$argnum" -eq 2 ]; then
+ complete -T $(_z_exec "select alias from jump_list")
+ elif [ "${WORDS[2]}" = "-a" ] && [ "$argnum" -eq 3 ]; then
+ complete -T -S '/' -d
fi
}
@@ -46,7 +54,7 @@ _z_add() {
echo "Directory not found: $dir"
return 1
fi
- fullpath=$(cd "$dir"; pwd)
+ fullpath=$(realpath "$dir")
if [ ! -d "$fullpath" ]; then
echo "Could not change to directory: $fullpath"
return 1