From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 3 Sep 2015 04:23:08 +0000 (-0700)
Subject: completion: set up _fdroid_* funcs at load time
X-Git-Tag: 0.5.0~132
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9eef437bcad59b3f7749f371ce5a5ae247c58930;p=fdroidserver.git

completion: set up _fdroid_* funcs at load time

This fixes an issue where these functions would not be created until fdroid
was completed at least once.
---

diff --git a/completion/bash-completion b/completion/bash-completion
index 0fd88d3b..97d46056 100644
--- a/completion/bash-completion
+++ b/completion/bash-completion
@@ -267,19 +267,22 @@ __complete_init() {
 	__complete_options
 }
 
-_fdroid() {
-	local cmd cmds
-	cmd=${COMP_WORDS[1]}
-	cmds=" build init install update publish checkupdates import \
-readmeta rewritemeta lint scanner verify stats server signindex "
+__cmds=" build init install update publish checkupdates import readmeta \
+rewritemeta lint scanner verify stats server signindex "
 
-	for c in $cmds; do eval "_fdroid_${c} () {
+for c in $__cmds; do
+	eval "_fdroid_${c} () {
 		local cur prev opts lopts
-		__fdroid_init ${c};
-	}"; done
+		__fdroid_init ${c}
+	}"
+done
+
+_fdroid() {
+	local cmd
+	cmd=${COMP_WORDS[1]}
 
-	[[ $cmds == *\ $cmd\ * ]] && _fdroid_${cmd} || {
-		(($COMP_CWORD == 1)) && COMPREPLY=( $( compgen -W "${cmds}" -- $cmd ) )
+	[[ $__cmds == *\ $cmd\ * ]] && _fdroid_${cmd} || {
+		(($COMP_CWORD == 1)) && COMPREPLY=( $( compgen -W "${__cmds}" -- $cmd ) )
 	}
 }