Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
v1.17: cargo-install-all: use full path for sourcing (backport of #34525
Browse files Browse the repository at this point in the history
) (#34528)

cargo-install-all: use full path for sourcing (#34525)

Use full path for sourcing

(cherry picked from commit 51c9963)

Co-authored-by: Tyera <tyera@solana.com>
  • Loading branch information
mergify[bot] and Tyera authored Dec 19, 2023
1 parent 9a328fb commit 8301417
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions scripts/cargo-install-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 8301417

Please sign in to comment.