Skip to content

Commit e39170e

Browse files
committed
fix install-deps
1 parent 5a82fcf commit e39170e

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.evergreen/scripts/install-dependencies.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,27 @@ set -eu
55
# Install just.
66
# On Evergreen jobs, "CI" will be set, and we don't want to write to $HOME.
77
if [ "${CI:-}" == "true" ]; then
8-
BIN_DIR=${DRIVERS_TOOLS_BINARIES:-}
8+
_BIN_DIR=${DRIVERS_TOOLS_BINARIES:-}
99
else
10-
BIN_DIR=$HOME/.local/bin
10+
_BIN_DIR=$HOME/.local/bin
1111
fi
1212
if [ ! -f $BIN_DIR/just ]; then
1313
if [ "Windows_NT" = "${OS:-}" ]; then
14-
TARGET="--target x86_64-pc-windows-msvc"
14+
_TARGET="--target x86_64-pc-windows-msvc"
1515
else
16-
TARGET=""
16+
_TARGET=""
1717
fi
18-
curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- $TARGET --to "$BIN_DIR" || {
18+
curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- $_TARGET --to "$_BIN_DIR" || {
1919
# CARGO_HOME is defined in configure-env.sh
2020
export CARGO_HOME=${CARGO_HOME:-$HOME/.cargo/}
2121
export RUSTUP_HOME="${CARGO_HOME}/.rustup"
2222
. ${DRIVERS_TOOLS}/.evergreen/install-rust.sh
2323
cargo install just
2424
if [ "Windows_NT" = "${OS:-}" ]; then
25-
mv $CARGO_HOME/just.exe $BIN_DIR/just
25+
mv $CARGO_HOME/just.exe $_BIN_DIR/just
2626
else
27-
mv $CARGO_HOME/just $BIN_DIR
27+
mv $CARGO_HOME/just $_BIN_DIR
2828
fi
29+
export PATH="$_BIN_DIR:$PATH"
2930
}
3031
fi

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ else
1717
BIN_DIR=.venv/bin
1818
fi
1919

20-
bash $HERE/install-dependencies.sh
20+
. $HERE/install-dependencies.sh
2121

2222
# Ensure there is a python venv.
2323
if [ ! -d $BIN_DIR ]; then

0 commit comments

Comments
 (0)