refactor: Replace 'BPM_CWD' with 'BASH_TEST_TMPDIR'

Author: hyperupcall

pkg/lib/cmd/bpm.sh

@@ -30,6 +30,7 @@ main() {
 			exit
 			;;
 		--global|-g)
+			# shellcheck disable=SC2034
 			BPM_MODE='global'
 			shift
 			;;

pkg/lib/commands/do-add.sh

@@ -36,7 +36,7 @@ do-add() {
 		die "No packages may be supplied when using '--all'"
 	fi
 
-	if [ "$BPM_MODE" = local ] && (( ${#pkgs[@]} > 0 )); then
+	if [ "$BPM_MODE" = 'local' ] && (( ${#pkgs[@]} > 0 )); then
 		die "Cannot specify individual packages for subcommand 'add' in local projects. Please edit your 'bpm.toml' and use either 'add --all' or 'remove --all'"
 	fi
 

tests/do-add.bats

@@ -236,7 +236,7 @@ load 'util/init.sh'
 	echo "dependencies = [ 'file://$BPM_ORIGIN_DIR/$pkg3' ]" > 'bpm.toml'
 	git add .
 	git commit -m 'Add bpm.toml'
-	cd "$BPM_CWD"
+	cd "$BATS_TEST_TMPDIR"
 
 	echo "dependencies = [ 'file://$BPM_ORIGIN_DIR/$pkg', 'file://$BPM_ORIGIN_DIR/$pkg2' ]" > 'bpm.toml'
 	BPM_MODE='local' run do-add --all
@@ -255,7 +255,7 @@ load 'util/init.sh'
 	cd "$BPM_ORIGIN_DIR/$pkg1"
 	git commit --allow-empty -m 'v0.1.0'
 	git tag -a 'v0.1.0' -m 'Version: v0.1.0'
-	cd "$BPM_CWD"
+	cd "$BATS_TEST_TMPDIR"
 
 	echo "dependencies = [ 'file://$BPM_ORIGIN_DIR/$pkg1@v0.1.0' ]" > 'bpm.toml'
 	BPM_MODE='local' run do-add --all
@@ -274,7 +274,7 @@ load 'util/init.sh'
 	cd "$BPM_ORIGIN_DIR/$pkg1"
 	git commit --allow-empty -m 'v0.1.0'
 	git tag 'v0.1.0' -m 'Version: v0.1.0'
-	cd "$BPM_CWD"
+	cd "$BATS_TEST_TMPDIR"
 
 	echo "dependencies = [ 'file://$BPM_ORIGIN_DIR/$pkg1@v0.1.0' ]" > 'bpm.toml'
 	BPM_MODE='local' run do-add --all

tests/do-list.bats

@@ -164,7 +164,7 @@ $site/username2/p2
 	touch 'script2.sh'
 	git add .
 	git commit -m 'Add script'
-	cd "$BPM_CWD"
+	cd "$BATS_TEST_TMPDIR"
 
 	do-list --fetch
 	run do-list

tests/do-plumbing-clone.bats

@@ -36,7 +36,7 @@ load 'util/init.sh'
 	cd "$BPM_ORIGIN_DIR/$pkg"
 	git commit --allow-empty -m "v0.1.0"
 	git tag 'v0.1.0' -m ''
-	cd "$BPM_CWD"
+	cd "$BATS_TEST_TMPDIR"
 
 	run do-plumbing-clone "file://$BPM_ORIGIN_DIR/$pkg" "$site/$pkg" "v0.1.0"
 

tests/do-upgrade.bats

@@ -13,7 +13,7 @@ load 'util/init.sh'
 	touch 'script2.sh'
 	git add .
 	git commit -m 'Add script'
-	cd "$BPM_CWD"
+	cd "$BATS_TEST_TMPDIR"
 
 	do-upgrade "$site/$pkg"
 
@@ -40,7 +40,7 @@ load 'util/init.sh'
 	touch 'script2.sh'
 	git add .
 	git commit -m 'Add script'
-	cd "$BPM_CWD"
+	cd "$BATS_TEST_TMPDIR"
 
 	run do-upgrade "$BPM_ORIGIN_DIR/$pkg"
 
@@ -60,7 +60,7 @@ load 'util/init.sh'
 	touch 'completions/file.sh' 'bin/file' 'man/man1/file.1'
 	git add .
 	git commit -m 'Add script'
-	cd "$BPM_CWD"
+	cd "$BATS_TEST_TMPDIR"
 
 	do-upgrade "$site/$pkg"
 
@@ -91,7 +91,7 @@ load 'util/init.sh'
 	touch 'script2.sh'
 	git add .
 	git commit -m 'Add script'
-	cd "$BPM_CWD"
+	cd "$BATS_TEST_TMPDIR"
 
 	do-upgrade "$site/$pkg"
 
@@ -115,7 +115,7 @@ load 'util/init.sh'
 	rm 'bpm.toml'
 	git add .
 	git commit -m 'Remove bpm.toml'
-	cd "$BPM_CWD"
+	cd "$BATS_TEST_TMPDIR"
 
 	do-upgrade "$site/$pkg"
 

tests/util/init.sh

@@ -14,29 +14,28 @@ export XDG_DATA_HOME=
 
 # Test-specific
 export BPM_TEST_DIR="$BATS_TMPDIR/bpm"
-export BPM_CWD="$BPM_TEST_DIR/cwd"
 export BPM_ORIGIN_DIR="$BPM_TEST_DIR/origin"
 export BPM_MODE_TEST=
 export BPM_MODE='global' # normal default is 'local'
 
 # Stub common variables
+export PROGRAM_LIB_DIR="$BPM_ROOT/source/pkg/lib"
 test_util.get_bpm_root
 export BPM_ROOT="$REPLY"
 export BPM_PREFIX="$BPM_TEST_DIR/cellar"
 export BPM_PACKAGES_PATH="$BPM_PREFIX/packages"
 export BPM_INSTALL_BIN="$BPM_PREFIX/bin"
 export BPM_INSTALL_MAN="$BPM_PREFIX/man"
 export BPM_INSTALL_COMPLETIONS="$BPM_PREFIX/completions"
-export PROGRAM_LIB_DIR="$BPM_ROOT/source/pkg/lib"
 
 export PATH="$BPM_ROOT/source/pkg/bin:$PATH"
 for f in "$BPM_ROOT"/source/pkg/lib/{commands,util}/?*.sh; do
 	source "$f"
 done
 
 setup() {
-	mkdir -p "$BPM_TEST_DIR" "$BPM_CWD" "$BPM_ORIGIN_DIR"
-	cd "$BPM_CWD"
+	mkdir -p "$BPM_TEST_DIR" "$BATS_TEST_TMPDIR" "$BPM_ORIGIN_DIR"
+	cd "$BATS_TEST_TMPDIR"
 }
 
 teardown() {

tests/util/test_util.sh

@@ -105,7 +105,7 @@ test_util.setup_pkg() {
 test_util.finish_pkg() {
 	git add .
 	git commit --allow-empty -m "Make changes"
-	cd "$BPM_CWD"
+	cd "$BATS_TEST_TMPDIR"
 }
 
 # @description Utility function to create an empty package