feat: Support symlinking Bash completions from system locations

Of course, these system locations are relative to the repository location

Author: hyperupcall

pkg/lib/util/abstract-completions.sh

@@ -83,20 +83,36 @@ abstract.completions_search_heuristics() {
 			fi
 		done
 	done
+
+	if [[ $type == all || $type == bash ]]; then
+		for completion_dir in share/bash-completion/completions etc/bash_completion.d; do
+			for file in "$BPM_PACKAGES_PATH/$id/$completion_dir"/*; do
+				local fileName="${file##*/}"
+
+				abstract.completions_do_action_bash "$action" "$file"
+			done
+		done
+	fi
 }
 
 abstract.completions_do_action_bash() {
 	local action="$1"
 	local file="$2"
 
+	local fileName="${file##*/}"
+	if [[ $fileName != *.* ]]; then
+		fileName="$fileName.bash"
+	fi
+
+
 	case "$action" in
 	link)
 		mkdir -p "$BPM_INSTALL_COMPLETIONS/bash"
-		ln -sf "$file" "$BPM_INSTALL_COMPLETIONS/bash/${file##*/}"
+		ln -sf "$file" "$BPM_INSTALL_COMPLETIONS/bash/$fileName"
 		;;
 	unlink)
-		if [ -f "$BPM_INSTALL_COMPLETIONS/bash/${file##*/}" ]; then
-			unlink "$BPM_INSTALL_COMPLETIONS/bash/${file##*/}"
+		if [ -f "$BPM_INSTALL_COMPLETIONS/bash/$fileName" ]; then
+			unlink "$BPM_INSTALL_COMPLETIONS/bash/$fileName"
 		fi
 		;;
 	esac

tests/do-plumbing-link-completions.bats

@@ -107,6 +107,34 @@ load 'util/init.sh'
 	assert [ "$(readlink "$BPM_INSTALL_COMPLETIONS/bash/c4.bash")" = "$BPM_PACKAGES_PATH/$site/$pkg/contrib/completions/c4.bash" ]
 }
 
+@test "adds bash completions determined with heuristics (share/etc)" {
+	local site='github.com'
+	local pkg='username/package'
+
+	test_util.setup_pkg "$pkg"; {
+		mkdir -p 'share/bash-completion/completions'
+		mkdir -p 'etc/bash_completion.d'
+
+		touch 'share/bash-completion/completions/c1'
+		touch 'share/bash-completion/completions/c2.sh'
+		touch 'share/bash-completion/completions/c3.bash'
+		touch 'etc/bash_completion.d/c4'
+		touch 'etc/bash_completion.d/c5.sh'
+		touch 'etc/bash_completion.d/c6.bash'
+	}; test_util.finish_pkg
+	test_util.fake_add "$pkg"
+
+	run do-plumbing-link-completions "$site/$pkg"
+
+	assert_success
+	assert [ "$(readlink "$BPM_INSTALL_COMPLETIONS/bash/c1.bash")" = "$BPM_PACKAGES_PATH/$site/$pkg/share/bash-completion/completions/c1" ]
+	assert [ "$(readlink "$BPM_INSTALL_COMPLETIONS/bash/c2.sh")" = "$BPM_PACKAGES_PATH/$site/$pkg/share/bash-completion/completions/c2.sh" ]
+	assert [ "$(readlink "$BPM_INSTALL_COMPLETIONS/bash/c3.bash")" = "$BPM_PACKAGES_PATH/$site/$pkg/share/bash-completion/completions/c3.bash" ]
+	assert [ "$(readlink "$BPM_INSTALL_COMPLETIONS/bash/c4.bash")" = "$BPM_PACKAGES_PATH/$site/$pkg/etc/bash_completion.d/c4" ]
+	assert [ "$(readlink "$BPM_INSTALL_COMPLETIONS/bash/c5.sh")" = "$BPM_PACKAGES_PATH/$site/$pkg/etc/bash_completion.d/c5.sh" ]
+	assert [ "$(readlink "$BPM_INSTALL_COMPLETIONS/bash/c6.bash")" = "$BPM_PACKAGES_PATH/$site/$pkg/etc/bash_completion.d/c6.bash" ]
+}
+
 @test "adds bash completions determined from heuristics when when ZSH_COMPLETIONS is specified in package.sh" {
 	local site='github.com'
 	local pkg="username/package"