fix: Upgrading a package now shows unlinking info messages

Author: hyperupcall

pkg/lib/commands/do-upgrade.sh

@@ -61,8 +61,8 @@ do_actual_upgrade() {
 	do-plumbing-unlink-bins "$id"
 	do-plumbing-unlink-completions "$id"
 	do-plumbing-unlink-man "$id"
-	local git_output=
 
+	local git_output=
 	if ! git_output="$(git -C "$BPM_PACKAGES_PATH/$id" pull 2>&1)"; then
 		log.error "Could not update Git repository"
 		printf "%s\n" "$git_output"

pkg/lib/util/abstract-bins.sh

@@ -1,13 +1,13 @@
 # shellcheck shell=bash
 
-abstract_bins_did=no
-
 abstract.bins() {
 	local action="$1"
 	local id="$2"
 	ensure.non_zero 'action' "$action"
 	ensure.non_zero 'id' "$id"
 
+	abstract_bins_did=no
+
 	local -a bins=()
 	local remove_extensions=
 

pkg/lib/util/abstract-completions.sh

@@ -1,14 +1,14 @@
 # shellcheck shell=bash
 
-abstract_completions_did=no
-
 abstract.completions() {
 	local action="$1"
 	local id="$2"
 	ensure.non_zero 'action' "$action"
 	ensure.non_zero 'id' "$id"
 	ensure.package_exists "$id"
 
+	abstract_completions_did=no
+
 	local bpm_toml_file="$BPM_PACKAGES_PATH/$id/bpm.toml"
 	local package_sh_file="$BPM_PACKAGES_PATH/$id/package.sh"
 
@@ -155,7 +155,7 @@ abstract.completions_do_action_zsh() {
 	local file="$2"
 
 	abstract.completions_do_echo
-	
+
 	if grep -qs "^#compdef" "$file"; then
 		local fileName="${file##*/}"
 		if [  "${fileName::1}" != _ ]; then

pkg/lib/util/abstract-mans.sh

@@ -1,6 +1,5 @@
 # shellcheck shell=bash
 
-abstract_mans_did=no
 
 abstract.mans() {
 	local action="$1"
@@ -9,6 +8,8 @@ abstract.mans() {
 	ensure.non_zero 'id' "$id"
 	ensure.package_exists "$id"
 
+	abstract_mans_did=no
+
 	local bpm_toml_file="$BPM_PACKAGES_PATH/$id/bpm.toml"
 
 	if [ -f "$bpm_toml_file" ]; then

tests/do-upgrade.bats

@@ -48,6 +48,33 @@ load 'util/init.sh'
 	assert_line -p "Package '$BPM_ORIGIN_DIR/$pkg' is not installed"
 }
 
+@test "simple upgrade properly prints linking and unlinking messages" {
+	local site='github.com'
+	local pkg='somedir/package'
+
+	test_util.create_package "$pkg"
+	test_util.mock_clone "$pkg" "$site/$pkg"
+
+	cd "$BPM_ORIGIN_DIR/$pkg"
+	mkdir 'completions' 'bin' 'man' 'man/man1'
+	touch 'completions/file.sh' 'bin/file' 'man/man1/file.1'
+	git add .
+	git commit -m 'Add script'
+	cd "$BPM_CWD"
+
+	do-upgrade "$site/$pkg"
+
+	unset BPM_MODE_TEST
+	run do-upgrade "$pkg"
+
+	assert_success
+	assert_line -p -n 1 "Unlinking bin files"
+	assert_line -p -n 2 "Unlinking completion files"
+	assert_line -p -n 3 "Unlinking man files"
+	assert_line -p -n 4 "Linking bin files"
+	assert_line -p -n 5 "Linking completion files"
+	assert_line -p -n 6 "Linking man files"
+}
 
 @test "symlinks stay valid after upgrade" {
 	local site='github.com'