From 6d4d1752fc99bcc1bf6023702282bb7f20850381 Mon Sep 17 00:00:00 2001
From: Edwin Kofler <edwin@kofler.dev>
Date: Sun, 5 Nov 2023 02:25:17 -0800
Subject: [PATCH] Clean `aliases.completion.bash`

---
 clean_files.txt                              | 1 +
 completion/available/aliases.completion.bash | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/clean_files.txt b/clean_files.txt
index 758e3b80a7..77805b3eb7 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -31,6 +31,7 @@ lint_clean_files.sh
 
 # completions
 #
+completion/available/aliases.completion.bash
 completion/available/apm.completion.bash
 completion/available/awless.completion.bash
 completion/available/awscli.completion.bash
diff --git a/completion/available/aliases.completion.bash b/completion/available/aliases.completion.bash
index 3e45e960cf..a4b15959a8 100644
--- a/completion/available/aliases.completion.bash
+++ b/completion/available/aliases.completion.bash
@@ -20,7 +20,7 @@ function _bash-it-component-completion-callback-on-init-aliases() {
 	completions=("${completions[@]##complete -* * -}") # strip all but last option plus trigger(s)
 	completions=("${completions[@]#complete -}")       # strip anything missed
 	completions=("${completions[@]#? * }")             # strip last option and arg, leaving only trigger(s)
-	completions=("${completions[@]#? }")       # strip anything missed
+	completions=("${completions[@]#? }")               # strip anything missed
 	#TODO: this will fail on some completions...
 
 	# create temporary file for wrapper functions and completions
@@ -40,10 +40,10 @@ function _bash-it-component-completion-callback-on-init-aliases() {
 		line="${line#alias -- }"
 		line="${line#alias }"
 		alias_name="${line%%=*}"
-		alias_defn="${line#*=\'}"                 # alias definition
+		alias_defn="${line#*=\'}" # alias definition
 		alias_defn="${alias_defn%\'}"
 		alias_cmd="${alias_defn%%[[:space:]]*}" # first word of alias
-		if [[ ${alias_defn} == ${alias_cmd} ]]; then
+		if [[ ${alias_defn} == "${alias_cmd}" ]]; then
 			alias_args=''
 		else
 			alias_args="${alias_defn#*[[:space:]]}" # everything after first word
@@ -89,7 +89,7 @@ function _bash-it-component-completion-callback-on-init-aliases() {
                             prec_word=\${prec_word#* }
                         fi
                         (( COMP_CWORD += ${#alias_arg_words[@]} ))
-                        COMP_WORDS=(\"$alias_cmd\" \"${alias_arg_words[@]}\" \"\${COMP_WORDS[@]:1}\")
+                        COMP_WORDS=(\"$alias_cmd\" \"${alias_arg_words[*]}\" \"\${COMP_WORDS[@]:1}\")
                         (( COMP_POINT -= \${#COMP_LINE} ))
                         COMP_LINE=\${COMP_LINE/$alias_name/$alias_cmd $alias_args}
                         (( COMP_POINT += \${#COMP_LINE} ))