Skip to content

Commit 2291e66

Browse files
committed
refactor: Rename 'BPM_MODE_TEST' to 'BPM_IS_TEST'
Clearer since less close to the new 'BPM_MODE' rename
1 parent 24c4055 commit 2291e66

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

pkg/lib/commands/do-plumbing-add-deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ do-plumbing-add-deps() {
1818

1919
# Install transitive dependencies
2020
local subDep="$BPM_PACKAGES_PATH/$id"
21-
if [[ ! -d "$subDep" && -n "${BPM_MODE_TEST+x}" ]]; then
21+
if [[ ! -d "$subDep" && -n "${BPM_IS_TEST+x}" ]]; then
2222
# During some tests, plumbing-* or Git commands may be stubbed,
2323
# so the package may not actually be cloned
2424
return

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ do-plumbing-clone() {
3535
exit 1
3636
fi
3737

38-
if [ -n "${BPM_MODE_TEST+x}" ]; then
38+
if [ -n "${BPM_IS_TEST+x}" ]; then
3939
printf "%s\n" "$git_output"
4040
fi
4141

@@ -52,7 +52,7 @@ do-plumbing-clone() {
5252
exit 1
5353
fi
5454

55-
if [ -n "${BPM_MODE_TEST+x}" ]; then
55+
if [ -n "${BPM_IS_TEST+x}" ]; then
5656
printf "%s\n" "$git_output"
5757
fi
5858
fi

pkg/lib/commands/do-upgrade.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ do_actual_upgrade() {
121121
exit 1
122122
fi
123123

124-
if [ -n "${BPM_MODE_TEST+x}" ]; then
124+
if [ -n "${BPM_IS_TEST+x}" ]; then
125125
printf "%s\n" "$git_output"
126126
fi
127127

pkg/lib/util/util.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ util.setup_mode() {
273273
if project_root_dir="$(util.get_project_root_dir)"; then
274274
# Output to standard error because some subcommands may be scriptable (ex. list)
275275
log.info "Operating in context of local bpm.toml" >&2
276-
if [ "${BPM_MODE_TEST+x}" ]; then
276+
if [ "${BPM_IS_TEST+x}" ]; then
277277
printf " -> %s\n" "'$project_root_dir'"
278278
fi
279279

tests/do-upgrade.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ load 'util/init.sh'
6464

6565
do-upgrade "$site/$pkg"
6666

67-
unset BPM_MODE_TEST
67+
unset BPM_IS_TEST
6868
run do-upgrade "$pkg"
6969

7070
assert_success

tests/util/init.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ export XDG_DATA_HOME=
1515
# Test-specific
1616
export BPM_TEST_DIR="$BATS_TMPDIR/bpm"
1717
export BPM_ORIGIN_DIR="$BPM_TEST_DIR/origin"
18-
export BPM_MODE_TEST=
19-
export BPM_MODE='global' # normal default is 'local'
18+
export BPM_IS_TEST=
2019

2120
# Stub common variables
2221
export PROGRAM_LIB_DIR="$BPM_ROOT/source/pkg/lib"
@@ -27,14 +26,15 @@ export BPM_PACKAGES_PATH="$BPM_PREFIX/packages"
2726
export BPM_INSTALL_BIN="$BPM_PREFIX/bin"
2827
export BPM_INSTALL_MAN="$BPM_PREFIX/man"
2928
export BPM_INSTALL_COMPLETIONS="$BPM_PREFIX/completions"
29+
export BPM_MODE='global' # normal default is 'local'
3030

3131
export PATH="$BPM_ROOT/source/pkg/bin:$PATH"
3232
for f in "$BPM_ROOT"/source/pkg/lib/{commands,util}/?*.sh; do
3333
source "$f"
3434
done
3535

3636
setup() {
37-
mkdir -p "$BPM_TEST_DIR" "$BATS_TEST_TMPDIR" "$BPM_ORIGIN_DIR"
37+
mkdir -p "$BPM_TEST_DIR" "$BPM_ORIGIN_DIR"
3838
cd "$BATS_TEST_TMPDIR"
3939
}
4040

0 commit comments

Comments
 (0)