fix: Improve completions, printf calls

Author: hyperupcall

completions/_bpm.zsh

@@ -8,10 +8,10 @@ _1st_arguments=(
 	'link:Link a local package'
 	'list:List packages'
 	'package-path:Print the full path of a package'
+	'prune:Prune all packages'
 	'remove:Uninstall a package'
 	'upgrade:[TASK] Upgrade a package'
-	'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
-	'--version:Prints the Vagrant version information'
+	'--version:Print version'
 	'--global:Switch to global dependency management'
 	'--help:Show help'
 )
@@ -59,6 +59,8 @@ case $state in
 			_describe -t commands "gem subcommand" subcommandOptions
 			;;
 		(remove)
+			local -a subcommandOptions=(--all)
+			_describe -t commands "gem subcommand" subcommandOptions
 			;;
 		(upgrade)
 			local subcommandOptions=()

completions/bpm.bash

@@ -80,6 +80,8 @@ _bpm() {
 				readarray -t COMPREPLY < <(IFS=' ' compgen -W "${subcommandOptions[*]}" -- "$currentWord")
 				;;
 			remove)
+				subcommandOptions=(--all)
+				readarray -t COMPREPLY < <(IFS=' ' compgen -W "${subcommandOptions[*]}" -- "$currentWord")
 				;;
 			upgrade)
 				readarray -t subcommandOptions < <(bpm complete package-path)

completions/bpm.fish

@@ -32,6 +32,10 @@ set subcmd package-path
 set -l subcommandOptions
 complete -c $cmd -f -n "__fish_seen_subcommand_from $subcmd" -a "$subcommandOptions (bpm complete package-path)"
 
+set subcmd remove
+set -l subcommandOptions --all
+complete -c $cmd -f -n "__fish_seen_subcommand_from $subcmd" -a "$subcommandOptions (bpm complete upgrade)"
+
 set subcmd upgrade
 set -l subcommandOptions
 # TODO: only complete if (bpm complete upgrade) was successfull

pkg/lib/commands/do-plumbing-clone.sh

@@ -27,7 +27,7 @@ do-plumbing-clone() {
 	git_args+=("$uri")
 	git_args+=("$BPM_PACKAGES_PATH/$id")
 
-	printf '%s\n' "  -> Cloning Git repository"
+	printf '  -> %s\n' "Cloning Git repository"
 	local git_output=
 	if ! git_output="$(git clone "${git_args[@]}" 2>&1)"; then
 		log.error "Could not clone repository"

pkg/lib/commands/do-remove.sh

@@ -73,10 +73,10 @@ do_actual_removal() {
 	do-plumbing-unlink-completions "$id"
 
 	if [ "${id%%/*}" = 'local' ]; then
-		printf '%s\n' "  -> Unsymlinking directory"
+		printf '  -> %s\n' "Unsymlinking directory"
 		unlink "$BPM_PACKAGES_PATH/$id"
 	else
-		printf '%s\n' "  -> Removing Git repository"
+		printf '  -> %s\n' "Removing Git repository"
 		rm -rf "${BPM_PACKAGES_PATH:?}/$id"
 		if ! rmdir -p "${BPM_PACKAGES_PATH:?}/${id%/*}" &>/dev/null; then
 			# Do not exit on "failure"

pkg/lib/util/abstract-bins.sh

@@ -104,8 +104,8 @@ abstract.bins_do_action() {
 		abstract_bins_did='yes'
 
 		case "$action" in
-			link) printf '%s\n' "  -> Linking bin files" ;;
-			unlink) printf '%s\n' "  -> Unlinking bin files" ;;
+			link) printf '  -> %s\n' "Linking bin files" ;;
+			unlink) printf '  -> %s\n' "Unlinking bin files" ;;
 		esac
 	fi
 

pkg/lib/util/abstract-completions.sh

@@ -225,8 +225,8 @@ abstract.completions_do_echo() {
 		abstract_completions_did=yes
 
 		case "$action" in
-			link) printf '%s\n' "  -> Linking completion files" ;;
-			unlink) printf '%s\n' "  -> Unlinking completion files" ;;
+			link) printf '  -> %s\n' "Linking completion files" ;;
+			unlink) printf '  -> %s\n' "Unlinking completion files" ;;
 		esac
 	fi
 }

pkg/lib/util/abstract-mans.sh

@@ -89,8 +89,8 @@ abstract.mans_do_action() {
 			abstract_mans_did=yes
 
 			case "$action" in
-				link) printf '%s\n' "  -> Linking man files" ;;
-				unlink) printf '%s\n' "  -> Unlinking man files" ;;
+				link) printf '  -> %s\n' "Linking man files" ;;
+				unlink) printf '  -> %s\n' "Unlinking man files" ;;
 			esac
 		fi