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

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

Merged
merged 1 commit into from
Dec 19, 2023
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions scripts/cargo-install-all.sh
View file
Open in desktop
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