Skip to content

Commit

Permalink
Fix regression when calling *_custom_func (#1001)
Browse files Browse the repository at this point in the history
PR #889 introduced a regression where the global variable $c is no
longer set when *custom_func is called.  This is because $c is re-used
by mistake in the read loop.

This PR simply changes the name of the variable used in the loop.

Signed-off-by: Marc Khouzam <[email protected]>
  • Loading branch information
marckhouzam authored and jharshman committed Dec 26, 2019
1 parent 447f182 commit bf26895
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions bash_completions.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ __%[1]s_contains_word()
__%[1]s_handle_reply()
{
__%[1]s_debug "${FUNCNAME[0]}"
local comp
case $cur in
-*)
if [[ $(type -t compopt) = "builtin" ]]; then
Expand All @@ -72,8 +73,8 @@ __%[1]s_handle_reply()
else
allflags=("${flags[*]} ${two_word_flags[*]}")
fi
while IFS='' read -r c; do
COMPREPLY+=("$c")
while IFS='' read -r comp; do
COMPREPLY+=("$comp")
done < <(compgen -W "${allflags[*]}" -- "$cur")
if [[ $(type -t compopt) = "builtin" ]]; then
[[ "${COMPREPLY[0]}" == *= ]] || compopt +o nospace
Expand Down Expand Up @@ -124,13 +125,13 @@ __%[1]s_handle_reply()
if [[ ${#must_have_one_flag[@]} -ne 0 ]]; then
completions+=("${must_have_one_flag[@]}")
fi
while IFS='' read -r c; do
COMPREPLY+=("$c")
while IFS='' read -r comp; do
COMPREPLY+=("$comp")
done < <(compgen -W "${completions[*]}" -- "$cur")
if [[ ${#COMPREPLY[@]} -eq 0 && ${#noun_aliases[@]} -gt 0 && ${#must_have_one_noun[@]} -ne 0 ]]; then
while IFS='' read -r c; do
COMPREPLY+=("$c")
while IFS='' read -r comp; do
COMPREPLY+=("$comp")
done < <(compgen -W "${noun_aliases[*]}" -- "$cur")
fi
Expand Down

0 comments on commit bf26895

Please sign in to comment.