Skip to content

Commit 098ab70

Browse files
committed
fix handling of just
1 parent cd4265e commit 098ab70

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.evergreen/install-dependencies.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,19 @@ else
1414
fi
1515

1616
# Install just.
17-
if [ ! -f $HOME/.local/bin/just ]; then
18-
curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to "$HOME/.local/bin" || {
17+
if [ "${CI:-}" == "true" ]; then
18+
BIN_DIR=$MONGODB_BINARIES
19+
else
20+
BIN_DIR=$HOME/.local/bin
21+
fi
22+
if [ ! -f $BIN_DIR/just ]; then
23+
curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to "$BIN_DIR" || {
1924
# CARGO_HOME is defined in configure-env.sh
2025
export CARGO_HOME=${CARGO_HOME:-$HOME/.cargo/}
2126
export RUSTUP_HOME="${CARGO_HOME}/.rustup"
2227
${DRIVERS_TOOLS}/.evergreen/install-rust.sh
2328
cargo install just
24-
mv $CARGO_HOME/just $HOME/.local/bin
29+
mv $CARGO_HOME/just $BIN_DIR
2530
}
2631
fi
2732

.evergreen/scripts/setup-dev-env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if [ -d .git ]; then
6363
fi
6464

6565
# Ensure the pre-commit hook is installed.
66-
if ! -f .git/hooks/pre-commit ]; then
66+
if [ ! -f .git/hooks/pre-commit ]; then
6767
pre-commit install
6868
fi
6969
fi

0 commit comments

Comments
 (0)