From 51c9963a60a3deaa2eb0e184e218a14f5899bcf6 Mon Sep 17 00:00:00 2001 From: Tyera Date: Tue, 19 Dec 2023 12:58:16 -0700 Subject: [PATCH] cargo-install-all: use full path for sourcing (#34525) Use full path for sourcing --- scripts/cargo-install-all.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh index e48ce4e02..003d63fd1 100755 --- a/scripts/cargo-install-all.sh +++ b/scripts/cargo-install-all.sh @@ -17,7 +17,8 @@ if [[ $OSTYPE == darwin* ]]; then fi fi -cargo="$("${readlink_cmd}" -f "${here}/../cargo")" +SOLANA_ROOT="$("${readlink_cmd}" -f "${here}/..")" +cargo="${SOLANA_ROOT}/cargo" set -e @@ -150,7 +151,7 @@ mkdir -p "$installDir/bin" # Exclude `spl-token` binary for net.sh builds if [[ -z "$validatorOnly" ]]; then # shellcheck source=scripts/spl-token-cli-version.sh - source "$here"/spl-token-cli-version.sh + source "$SOLANA_ROOT"/scripts/spl-token-cli-version.sh # the patch-related configs are needed for rust 1.69+ on Windows; see Cargo.toml # shellcheck disable=SC2086 # Don't want to double quote $rust_version