Start rewrite: Remove --package and --install from 'build'

completion/bash-completion

@@ -23,14 +23,6 @@
 #
 # This way, one can simply do 'fbld com.some.app' or 'fcheckup com.some.app'
 
-__fdroid_cwd() {
-	if [[ "${PWD##*/}" == metadata ]]; then
-		subdir=.
-	else
-		[ -d metadata ] && subdir=metadata || return 1
-	fi
-}
-
 __fdroid_init() {
 	COMPREPLY=()
 	cur="${COMP_WORDS[COMP_CWORD]}"
@@ -40,29 +32,24 @@ __fdroid_init() {
 }
 
 __package() {
-	[ -n "$subdir" ] || __fdroid_cwd
-	files=( ${subdir}/*.txt )
-	files=( ${files[@]#${subdir}/} )
+	files=( metadata/*.txt )
+	files=( ${files[@]#metadata/} )
 	files=${files[@]%.txt}
 	COMPREPLY=( $( compgen -W "$files" -- $cur ) )
 }
 
+__signed_package() {
+	files=( repo/*.apk )
+	files=( ${files[@]#repo/} )
+	files=${files[@]%_*}
+	COMPREPLY=( $( compgen -W "$files" -- $cur ) )
+}
+
 __vercode() {
-	local s p_found p
-	s=${#COMP_WORDS[*]}
-	p_found=false
+	local p
+	p=${cur:0:-1}
 
-	$aliased && p=${COMP_WORDS[1]} || {
-		for (( i=1; i <= s; i++ )); do
-			$p_found && { p=${COMP_WORDS[$i]}; break;}
-			[[ ${COMP_WORDS[$i]} == -p ]] || [[ ${COMP_WORDS[$i]} == --package ]] &&\
-				p_found=true
-		done
-		$p_found || return 0
-	}
-	[ -n "$subdir" ] || __fdroid_cwd
-
-	COMPREPLY=( $( compgen -W "$( while read line; do
+	COMPREPLY=( $( compgen -P "${p}:" -W "$( while read line; do
 		if [[ "$line" == "Build Version:"* ]]
 		then
 			line="${line#*,}"
@@ -72,7 +59,7 @@ __vercode() {
 			line="${line#*,}"
 			printf "${line%%,*} "
 		fi
-		done < "${subdir}/${p}.txt" )" -- $cur ) )
+		done < "metadata/${p}.txt" )" -- $cur ) )
 }
 
 __complete_options() {
@@ -88,15 +75,15 @@ __complete_options() {
 
 __complete_build() {
 	opts="-h -v -p -c -l -s -t -f"
-	lopts="--help --verbose --package --vercode --latest --server --resetserver
- --on-server --force --install --all"
-	case "${prev}" in
-		-p|--package)
-			__package
-			return 0;;
-		-c|--vercode)
+	lopts="--help --verbose --latest --server --resetserver --on-server
+ --force --all"
+	case "${cur}" in
+		*:)
 			__vercode
 			return 0;;
+		*)
+			__package
+			return 0;;
 	esac
 	__complete_options
 }
@@ -203,7 +190,6 @@ _fdroid() {
 	cmd=${COMP_WORDS[1]}
 	cmds=" build init update publish checkupdates import rewritemeta scanner verify stats server "
 	aliased=false
-	__fdroid_cwd || return 0
 
 	for c in $cmds; do eval "_fdroid_${c} () {
 		local cur prev cmds opts lopts
@@ -234,7 +220,6 @@ _fdroid_checkupdates_project() {
 }
 
 _fd-commit() {
-	__fdroid_cwd || return 0
 	__package
 }