From 02fc85a3c2ce5b44e2e5b61eea88865003117fed Mon Sep 17 00:00:00 2001 From: Mia McMahill Date: Sun, 7 Jun 2026 23:26:07 -0500 Subject: [PATCH] completion: Minor cleanup of variable usage in bash completion 1. Removed unnecessary punctuation to help with readability 2. Loop over RES elements directly instead of indexing 3. Declare COMPGEN_OPTS only once vs redeclaring on each iteration --- completion/flatpak | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/completion/flatpak b/completion/flatpak index 93e907575..d5ff62b7c 100644 --- a/completion/flatpak +++ b/completion/flatpak @@ -11,32 +11,33 @@ __flatpak() { readarray -t RES < <(flatpak complete "${COMP_LINE}" "${COMP_POINT}" "${cur}") COMPREPLY=() - local i + local res + local -a COMPGEN_OPTS local -a REPLIES - for i in "${!RES[@]}"; do - if [[ "${RES[$i]}" = "__FLATPAK_FILE" ]]; then - declare -a COMPGEN_OPTS=('-f') - elif [[ "${RES[$i]}" = "__FLATPAK_BUNDLE_FILE" ]]; then - declare -a COMPGEN_OPTS=('-f' '-X' '!*.flatpak') - elif [[ "${RES[$i]}" = "__FLATPAK_BUNDLE_OR_REF_FILE" ]]; then - declare -a COMPGEN_OPTS=('-f' '-X' '!*.flatpak@(|ref)') - elif [[ "${RES[$i]}" = "__FLATPAK_DIR" ]]; then - declare -a COMPGEN_OPTS=('-d') + for res in "${RES[@]}"; do + if [[ $res == "__FLATPAK_FILE" ]]; then + COMPGEN_OPTS=('-f') + elif [[ $res == "__FLATPAK_BUNDLE_FILE" ]]; then + COMPGEN_OPTS=('-f' '-X' '!*.flatpak') + elif [[ $res == "__FLATPAK_BUNDLE_OR_REF_FILE" ]]; then + COMPGEN_OPTS=('-f' '-X' '!*.flatpak@(|ref)') + elif [[ $res == "__FLATPAK_DIR" ]]; then + COMPGEN_OPTS=('-d') else - declare -a COMPGEN_OPTS=() + COMPGEN_OPTS=() fi if [[ ${#COMPGEN_OPTS[@]} -ne 0 ]]; then local CUR - if [[ "${cur}" = "=" ]]; then + if [[ $cur == "=" ]]; then CUR="" else - CUR="${cur}" + CUR="$cur" fi readarray -t REPLIES < <(compgen "${COMPGEN_OPTS[@]}" -- "${CUR}") COMPREPLY+=("${REPLIES[@]}") else - COMPREPLY=("${COMPREPLY[@]}" "${RES[$i]}") + COMPREPLY=("${COMPREPLY[@]}" "$res") fi done }