test: Fix 'echo' subcommand outputing wrong path information

Author: hyperupcall

pkg/lib/cmd/bpm.sh

@@ -39,10 +39,9 @@ main() {
 		esac
 	done
 
-
 	case "$1" in
 	add)
-		may_reset_bpm_vars "$is_global"
+		must_reset_bpm_vars "$is_global"
 
 		shift
 		do-add "$@"
@@ -52,6 +51,8 @@ main() {
 		do-complete "$@"
 		;;
 	echo)
+		may_reset_bpm_vars "$is_global"
+
 		shift
 		do-echo "$@"
 		;;
@@ -60,37 +61,37 @@ main() {
 		do-init "$@"
 		;;
 	link)
-		may_reset_bpm_vars "$is_global"
+		must_reset_bpm_vars "$is_global"
 
 		shift
 		do-link "$@"
 		;;
 	list)
-		may_reset_bpm_vars "$is_global"
+		must_reset_bpm_vars "$is_global"
 
 		shift
 		do-list "$@"
 		;;
 	outdated)
-		may_reset_bpm_vars "$is_global"
+		must_reset_bpm_vars "$is_global"
 
 		shift
 		bpm-outdated "$@"
 		;;
 	package-path)
-		may_reset_bpm_vars "$is_global"
+		must_reset_bpm_vars "$is_global"
 
 		shift
 		bpm-package-path "$@"
 		;;
 	remove)
-		may_reset_bpm_vars "$is_global"
+		must_reset_bpm_vars "$is_global"
 
 		shift
 		do-remove "$@"
 		;;
 	upgrade)
-		may_reset_bpm_vars "$is_global"
+		must_reset_bpm_vars "$is_global"
 
 		shift
 		do-upgrade "$@"
@@ -104,31 +105,35 @@ main() {
 	esac
 }
 
-may_reset_bpm_vars() {
+must_reset_bpm_vars() {
 	local is_global="$1"
 
-	if [ "$is_global" = 'no' ]; then
-		if ! project_root_directory="$(
-			while [[ ! -f "bpm.toml" && "$PWD" != / ]]; do
-				cd ..
-			done
+	local project_root_dir=
+	if ! project_root_dir="$(util.get_project_root_dir)"; then
+		die "No 'bpm.toml' file found. Please create one to install local packages or pass the '--global' option"
+	fi
 
-			if [[ $PWD == / ]]; then
-				die "No 'bpm.toml' file found. Please create one to install local packages or pass the '--global' option"
-			fi
+	do_set_bpm_vars "$project_root_dir"
+}
 
-			printf "%s" "$PWD"
-		)"; then
-			exit 1
-		fi
+may_reset_bpm_vars() {
+	local is_global="$1"
 
-		BPM_ROOT="$project_root_directory"
-		BPM_PREFIX="$project_root_directory/bpm_packages"
-		BPM_PACKAGES_PATH="$BPM_PREFIX/packages"
-		BPM_INSTALL_BIN="$BPM_PREFIX/bin"
-		BPM_INSTALL_MAN="$BPM_PREFIX/man"
-		BPM_INSTALL_COMPLETIONS="$BPM_PREFIX/completions"
+	local project_root_dir=
+	if project_root_dir="$(util.get_project_root_dir)"; then
+		do_set_bpm_vars "$project_root_dir"
 	fi
 }
 
+do_set_bpm_vars() {
+	local project_root_dir="$1"
+
+	BPM_ROOT="$project_root_dir"
+	BPM_PREFIX="$project_root_dir/bpm_packages"
+	BPM_PACKAGES_PATH="$BPM_PREFIX/packages"
+	BPM_INSTALL_BIN="$BPM_PREFIX/bin"
+	BPM_INSTALL_MAN="$BPM_PREFIX/man"
+	BPM_INSTALL_COMPLETIONS="$BPM_PREFIX/completions"
+}
+
 main "$@"

pkg/lib/util/util.sh

@@ -249,6 +249,20 @@ util.extract_shell_variable() {
 	return 1
 }
 
+# @description Get the working directory of the project. Note
+# that this should always be called within a subshell
+util.get_project_root_dir() {
+	while [[ ! -f "bpm.toml" && "$PWD" != / ]]; do
+		cd ..
+	done
+
+	if [[ $PWD == / ]]; then
+		return 1
+	fi
+
+	printf "%s" "$PWD"
+}
+
 util.show_help() {
 	cat <<"EOF"
 Usage:

tests/do-echo.bats

@@ -82,8 +82,6 @@ load 'util/init.sh'
 	assert_output "/usr/local/completions"
 }
 
-
-
 @test "non-global default BPM_ROOT" {
 	touch 'bpm.toml'