Skip to content

Commit 1bd5c1a

Browse files
committed
zsh: fix aliases in script
1 parent 13617b4 commit 1bd5c1a

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

example/cmd/_test/zsh.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
#compdef example
22
function _example_completion {
3+
local command="$(basename $words[1])"
34
local compline=${words[@]:0:$CURRENT}
45
local IFS=$'\n'
56
local lines
67

78
# shellcheck disable=SC2086,SC2154,SC2155
8-
lines="$(echo "${compline}''" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs example _carapace zsh 2>/dev/null)"
9+
lines="$(echo "${compline}''" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs "${command}" _carapace zsh 2>/dev/null)"
910
if [ $? -eq 1 ]; then
10-
lines="$(echo "${compline}'" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs example _carapace zsh 2>/dev/null)"
11+
lines="$(echo "${compline}'" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs "${command}" _carapace zsh 2>/dev/null)"
1112
if [ $? -eq 1 ]; then
12-
lines="$(echo "${compline}\"" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs example _carapace zsh 2>/dev/null)"
13+
lines="$(echo "${compline}\"" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs "${command}" _carapace zsh 2>/dev/null)"
1314
fi
1415
fi
1516

internal/shell/zsh/snippet.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@ import (
1212
func Snippet(cmd *cobra.Command) string {
1313
return fmt.Sprintf(`#compdef %v
1414
function _%[1]v_completion {
15+
local command="$(basename $words[1])"
1516
local compline=${words[@]:0:$CURRENT}
1617
local IFS=$'\n'
1718
local lines
1819
1920
# shellcheck disable=SC2086,SC2154,SC2155
20-
lines="$(echo "${compline}''" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs %[2]v _carapace zsh 2>/dev/null)"
21+
lines="$(echo "${compline}''" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs "${command}" _carapace zsh 2>/dev/null)"
2122
if [ $? -eq 1 ]; then
22-
lines="$(echo "${compline}'" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs %[2]v _carapace zsh 2>/dev/null)"
23+
lines="$(echo "${compline}'" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs "${command}" _carapace zsh 2>/dev/null)"
2324
if [ $? -eq 1 ]; then
24-
lines="$(echo "${compline}\"" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs %[2]v _carapace zsh 2>/dev/null)"
25+
lines="$(echo "${compline}\"" | CARAPACE_COMPLINE="${compline}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs "${command}" _carapace zsh 2>/dev/null)"
2526
fi
2627
fi
2728

0 commit comments

Comments
 (0)