From bf268956645942d536f2faef6d53f1951f9522a4 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Thu, 26 Dec 2019 12:55:42 -0500 Subject: [PATCH] Fix regression when calling *_custom_func (#1001) 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 --- bash_completions.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bash_completions.go b/bash_completions.go index 03ddda27a..1e0e25cf6 100644 --- a/bash_completions.go +++ b/bash_completions.go @@ -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 @@ -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 @@ -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