Merge pull request #1048 from akinomyoga/more-3rdparty-202309

feat: add fallback 3rd-party completion loaders

Author: akinomyoga

completions/.gitignore

@@ -38,6 +38,7 @@
 /c++
 /cc
 /cdrecord
+/_chezmoi
 /chrome
 /chromium
 /ci
@@ -52,10 +53,12 @@
 /compare
 /compgen
 /composite
+/_conda
 /conjure
 /_constellation
 /_consul
 /cowthink
+/_crc
 /createdb
 /createuser
 /_cz
@@ -193,6 +196,8 @@
 /neomutt
 /_nfpm
 /_nomad
+/_npm
+/_oc
 /_okteto
 /_op
 /_ory
@@ -206,6 +211,7 @@
 /pinfo
 /ping4
 /ping6
+/_pip3
 /pkg_deinstall
 /pkg_info
 /pkgconf
@@ -302,6 +308,8 @@
 /_tanzu-core
 /_tendermint
 /_terraform
+/_tkn
+/_tkn-pac
 /tightvncviewer
 /tracepath6
 /_trivy

completions/Makefile.am

@@ -208,6 +208,7 @@ bashcomp_DATA = 2to3 \
 		jshint \
 		json_xs \
 		jsonschema \
+		_jungle \
 		k3b \
 		kcov \
 		_keyring \
@@ -216,6 +217,7 @@ bashcomp_DATA = 2to3 \
 		kldload \
 		kldunload \
 		koji \
+		_kontena \
 		ktutil \
 		larch \
 		lastlog \
@@ -299,6 +301,7 @@ bashcomp_DATA = 2to3 \
 		nslookup \
 		nsupdate \
 		ntpdate \
+		_nvm \
 		oggdec \
 		openssl \
 		opera \
@@ -316,6 +319,7 @@ bashcomp_DATA = 2to3 \
 		pidof \
 		pine \
 		ping \
+		_pip \
 		_pipenv \
 		pkg-config \
 		pkg-get \
@@ -550,6 +554,7 @@ CLEANFILES = \
 	c++ \
 	cc \
 	cdrecord \
+	_chezmoi \
 	chrome \
 	chromium \
 	ci \
@@ -564,10 +569,12 @@ CLEANFILES = \
 	compare \
 	compgen \
 	composite \
+	_conda \
 	conjure \
 	_constellation \
 	_consul \
 	cowthink \
+	_crc \
 	createdb \
 	createuser \
 	_cz \
@@ -733,6 +740,8 @@ CLEANFILES = \
 	neomutt \
 	_nfpm \
 	_nomad \
+	_npm \
+	_oc \
 	_okteto \
 	_op \
 	_ory \
@@ -746,6 +755,7 @@ CLEANFILES = \
 	pinfo \
 	ping4 \
 	ping6 \
+	_pip3 \
 	pkg_deinstall \
 	pkg_info \
 	pkgconf \
@@ -860,6 +870,8 @@ CLEANFILES = \
 	_tanzu-core \
 	_tendermint \
 	_terraform \
+	_tkn \
+	_tkn-pac \
 	tightvncviewer \
 	tracepath6 \
 	_trivy \
@@ -960,7 +972,7 @@ symlinks: $(DATA)
 	$(ss) freeciv-server \
 		civserver
 	$(ss) _gaiacli \
-		_gaiad _tendermint
+		_gaiad _npm _tendermint
 	$(ss) gcc \
 		c++ cc f77 f95 g++ g++-5 g++-6 g++-7 g++-8 g77 g95 gcc-5 \
 		gcc-6 gcc-7 gcc-8 gccgo gccgo-5 gccgo-6 gccgo-7 gccgo-8 gcj \
@@ -977,9 +989,11 @@ symlinks: $(DATA)
 		_allero \
 		_arduino-cli \
 		_buf \
+		_chezmoi \
 		_cilium \
 		_cloudquery \
 		_constellation \
+		_crc \
 		_datree \
 		_docker \
 		_gardenctl \
@@ -1007,6 +1021,7 @@ symlinks: $(DATA)
 		_moldy \
 		_multi-gitter \
 		_nfpm \
+		_oc \
 		_okteto \
 		_op \
 		_ory \
@@ -1022,6 +1037,8 @@ symlinks: $(DATA)
 		_ssh-inscribe \
 		_tanzu \
 		_tanzu-core \
+		_tkn \
+		_tkn-pac \
 		_trivy \
 		_upctl \
 		_vacuum \
@@ -1102,6 +1119,7 @@ symlinks: $(DATA)
 		_ansible-playbook \
 		_ansible-pull \
 		_ansible-vault \
+		_conda \
 		_cz
 	$(ss) nslookup \
 		host
@@ -1113,6 +1131,8 @@ symlinks: $(DATA)
 		alpine
 	$(ss) ping \
 		ping4 ping6
+	$(ss) _pip \
+		_pip3
 	$(ss) _pipenv \
 		_black _blackd _flask _httpx
 	$(ss) pkg-config \

completions/_jungle

@@ -0,0 +1,16 @@
+# 3rd party completion loader for commands emitting        -*- shell-script -*-
+# their completion using "_${cmdname^^}_COMPLETE=source $cmd".
+# This pattern is very similar to `completions/_pipenv`, but the value of the
+# environment variable is slightly different.
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+eval -- "$(
+    # shellcheck disable=SC2154
+    ucname="${cmdname^^}"
+    ucname=${ucname//-/_}
+    export "_${ucname}_COMPLETE=source"
+    "$1" 2>/dev/null
+)"
+
+# ex: filetype=sh

completions/_kontena

@@ -0,0 +1,14 @@
+# 3rd party completion loader for kontena                  -*- shell-script -*-
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+# To avoid sourcing an empty string with `. "$(...)"` on failing to obtain the
+# path, we assign the output to a variable `_comp_cmd_kontena__completion_path`
+# and test it before sourcing.  The variable is removed on successful loading
+# but left on a failure for the debugging purpose.
+_comp_cmd_kontena__completion_path=$("$1" whoami --bash-completion-path 2>/dev/null) &&
+    [[ -r $_comp_cmd_kontena__completion_path ]] &&
+    . "$_comp_cmd_kontena__completion_path" &&
+    unset -v _comp_cmd_kontena__completion_path
+
+# ex: filetype=sh

completions/_nvm

@@ -0,0 +1,8 @@
+# 3rd party completion loader for nvm                      -*- shell-script -*-
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+# shellcheck disable=SC1091
+[[ ${NVM_DIR-} && -r $NVM_DIR/bash_completion ]] && . "$NVM_DIR"/bash_completion
+
+# ex: filetype=sh

completions/_pip

@@ -0,0 +1,9 @@
+# 3rd party completion loader for commands emitting        -*- shell-script -*-
+# their completion using "$cmd completion --bash".  For example, pip uses this
+# form of dynamic completions.
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+eval -- "$("$1" completion --bash 2>/dev/null)"
+
+# ex: filetype=sh

test/fallback/completions/Makefile.am

@@ -14,7 +14,9 @@ EXTRA_DIST = \
 	hexdump \
 	hwclock \
 	ionice \
+	jungle \
 	keyring \
+	kontena \
 	look \
 	mdbook \
 	mock \
@@ -24,6 +26,8 @@ EXTRA_DIST = \
 	newgrp \
 	nmcli \
 	nox \
+	nvm \
+	pip \
 	pipenv \
 	renice \
 	repomanage \

test/fallback/completions/jungle

@@ -0,0 +1 @@
+../../../completions/_jungle

test/fallback/completions/kontena

@@ -0,0 +1 @@
+../../../completions/_kontena

test/fallback/completions/nvm

@@ -0,0 +1 @@
+../../../completions/_nvm

test/fallback/completions/pip

@@ -0,0 +1 @@
+../../../completions/_pip