merged with upstreamHEADmaster

1 files changed, 21 insertions, 3 deletions

diff --git a/contrib/completion/bash/devtools.in b/contrib/completion/bash/devtools.in
index 136c80f..9025b46 100644
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -14,7 +14,6 @@ source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-inspect.sh
 # shellcheck source=src/lib/valid-search.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-search.sh
 
-_binary_arch=${DEVTOOLS_VALID_ARCHES[*]:0:-1}
 _colors=(never always auto)
 
 
@@ -28,6 +27,7 @@ _makechrootpkg_args=(
 	-I
 	-l
 	-n
+	-t
 	-T
 	-U
 	-x
@@ -37,6 +37,7 @@ _makechrootpkg_args_D_opts() { _filedir -d; }
 _makechrootpkg_args_r_opts() { _filedir -d; }
 _makechrootpkg_args_I_opts() { _filedir '*.pkg.tar.*'; }
 _makechrootpkg_args_l_opts() { _filedir -d; }
+_makechrootpkg_args_t_opts() { _filedir -d; }
 _makechrootpkg_args_U_opts() { :; }
 _makechrootpkg_args_x_opts() { _devtools_completions_inspect; }
 _makechrootpkg() { __devtools_complete _makechrootpkg; }
@@ -62,12 +63,14 @@ _mkarchroot_args=(
 	-C
 	-M
 	-c
+	-f
 	-h
 )
 _mkarchroot_args_U_opts() { _filedir '*.pkg.tar.*'; }
 _mkarchroot_args_C_opts() { _filedir '*.conf'; }
 _mkarchroot_args_M_opts() { _filedir '*.conf'; }
 _mkarchroot_args_c_opts() { _filedir -d; }
+_mkarchroot_args_f_opts() { _filedir -d; }
 _mkarchroot_opts() {
 	local args
 	args=$(__pkgctl_word_count_after_subcommand)
@@ -128,7 +131,7 @@ _offload_build_args=(
 )
 _offload_build_args__repo_opts() { _devtools_completions_build_repo; }
 _offload_build_args_r_opts() { _offload_build_args__repo_opts; }
-_offload_build_args__arch_opts() { _devtools_completions_arch; }
+_offload_build_args__arch_opts() { _devtools_completions_binary_arch; }
 _offload_build_args_a_opts() { _offload_build_args__arch_opts; }
 _offload_build_args__server_opts() { :; }
 _offload_build_args_s_opts() { _offload_build_args__server_opts; }
@@ -196,7 +199,7 @@ _pkgctl_build_args=(
 
 	-h --help
 )
-_pkgctl_build_args__arch_opts() { _devtools_completions_arch; }
+_pkgctl_build_args__arch_opts() { _devtools_completions_binary_arch; }
 _pkgctl_build_args__repo_opts() { _devtools_completions_repo; }
 _pkgctl_build_args__worker_opts() { :; }
 _pkgctl_build_args_w_opts() { _pkgctl_build_args__worker_opts; }
@@ -241,9 +244,13 @@ _pkgctl_db_move_opts() {
 
 
 _pkgctl_db_remove_args=(
+	--partial
+	--noconfirm
 	-a --arch
 	-h --help
 )
+_pkgctl_db_remove_args__arch_opts() { _devtools_completions_binary_arch; }
+_pkgctl_db_remove_args_a_opts() { _pkgctl_db_remove_args__arch_opts; }
 _pkgctl_db_remove_opts() {
 	local subcommand args
 	subcommand=(db remove)
@@ -289,6 +296,7 @@ _pkgctl_aur_drop_from_repo_opts() { _filedir -d; }
 
 
 _pkgctl_repo_cmds=(
+	clean
 	clone
 	configure
 	create
@@ -314,6 +322,12 @@ _pkgctl_repo_clone_args__jobs_opts() { :; }
 _pkgctl_repo_clone_args_j_opts() { _pkgctl_repo_clone_args__jobs_opts; }
 _pkgctl_repo_clone_opts() { _devtools_completions_all_packages; }
 
+_pkgctl_repo_clean_args=(
+	-i --interactive
+	-n --dry-run
+	-h --help
+)
+_pkgctl_repo_clean_opts() { _filedir -d; }
 
 _pkgctl_repo_configure_args=(
 	--protocol
@@ -373,6 +387,7 @@ _pkgctl_version_setup_opts() { _filedir -d; }
 _pkgctl_version_setup_args__url_opts() { :; }
 
 _pkgctl_version_upgrade_args=(
+	--no-update-checksums
 	-v --verbose
 	-h --help
 )
@@ -433,6 +448,9 @@ _devtools_completions_color() {
 _devtools_completions_arch() {
 	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_ARCHES[*]}" -- "$cur")
 }
+_devtools_completions_binary_arch() {
+	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_BINARY_ARCHES[*]}" -- "$cur")
+}
 _devtools_completions_repo() {
 	local optional=${1:-}
 	mapfile -t COMPREPLY < <(compgen -W "${optional} ${DEVTOOLS_VALID_REPOS[*]}" -- "$cur")