Skip to content

Commit 4ce588d

Browse files
authored
Merge pull request #79 from yassun7010/fix_bug
Fix bash file completion bug
2 parents 2955544 + 5c175f2 commit 4ce588d

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

cmdcomp/v2/templates/bash.sh.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ cur=$COMP_CWORD
9696
_get_comp_words_by_ref -n : cur prev cword
9797
dir="$(echo ${cur} | grep -o ".*/")"
9898
if test "${dir}" ;then
99-
COMPREPLY=( $(compgen -W "$(ls -F $1/${dir} | sed -E "s@(.*)@${dir}\1@g")" -- "${cur}") )
99+
COMPREPLY=( $(compgen -W "$(ls -F "{{ base_path }}/${dir}" | sed -E "s@(.*)@${dir}\1@g")" -- "${cur}") )
100100
else
101-
COMPREPLY=( $(compgen -W "$(ls -F $1/)" -- "${cur}") )
101+
COMPREPLY=( $(compgen -W "$(ls -F "{{ base_path }}/")" -- "${cur}") )
102102
fi
103103
{%- endmacro -%}
104104

examples/v2/output.bash

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ _cliname() {
8989
_get_comp_words_by_ref -n : cur prev cword
9090
dir="$(echo ${cur} | grep -o ".*/")"
9191
if test "${dir}" ;then
92-
COMPREPLY=( $(compgen -W "$(ls -F $1/${dir} | sed -E "s@(.*)@${dir}\1@g")" -- "${cur}") )
92+
COMPREPLY=( $(compgen -W "$(ls -F "./${dir}" | sed -E "s@(.*)@${dir}\1@g")" -- "${cur}") )
9393
else
94-
COMPREPLY=( $(compgen -W "$(ls -F $1/)" -- "${cur}") )
94+
COMPREPLY=( $(compgen -W "$(ls -F "./")" -- "${cur}") )
9595
fi
9696

9797
return 0
@@ -158,9 +158,9 @@ _cliname() {
158158
_get_comp_words_by_ref -n : cur prev cword
159159
dir="$(echo ${cur} | grep -o ".*/")"
160160
if test "${dir}" ;then
161-
COMPREPLY=( $(compgen -W "$(ls -F $1/${dir} | sed -E "s@(.*)@${dir}\1@g")" -- "${cur}") )
161+
COMPREPLY=( $(compgen -W "$(ls -F "./${dir}" | sed -E "s@(.*)@${dir}\1@g")" -- "${cur}") )
162162
else
163-
COMPREPLY=( $(compgen -W "$(ls -F $1/)" -- "${cur}") )
163+
COMPREPLY=( $(compgen -W "$(ls -F "./")" -- "${cur}") )
164164
fi
165165

166166
return 0
@@ -193,9 +193,9 @@ _cliname() {
193193
_get_comp_words_by_ref -n : cur prev cword
194194
dir="$(echo ${cur} | grep -o ".*/")"
195195
if test "${dir}" ;then
196-
COMPREPLY=( $(compgen -W "$(ls -F $1/${dir} | sed -E "s@(.*)@${dir}\1@g")" -- "${cur}") )
196+
COMPREPLY=( $(compgen -W "$(ls -F "$HOME/${dir}" | sed -E "s@(.*)@${dir}\1@g")" -- "${cur}") )
197197
else
198-
COMPREPLY=( $(compgen -W "$(ls -F $1/)" -- "${cur}") )
198+
COMPREPLY=( $(compgen -W "$(ls -F "$HOME/")" -- "${cur}") )
199199
fi
200200

201201
return 0

0 commit comments

Comments
 (0)