Fix solana docker image (#20550)

The docker image fails with:

/usr/bin/solana-run.sh: line 66: ./fetch-spl.sh: No such file or directory

In the solana docker image, scripts/run.sh is copied to
/usr/bin/solana-run.sh and fetch-spl.sh to /usr/bin/fetch-spl.sh. This
means that the line:

cd "$(dirname "$0")/.."

means we're doing a "cd /usr", which means we can't find fetch-spl.sh or
spl-genesis-args.sh (i.e., the error above).

(cherry picked from commit 2762f6f96f)

Co-authored-by: Sean Young <sean@mess.org>
This commit is contained in:
mergify[bot]
2021-10-08 22:33:42 +00:00
committed by GitHub
parent 598e2934ba
commit ca271892c8

View File

@ -8,7 +8,13 @@
set -e set -e
# Prefer possible `cargo build` binaries over PATH binaries # Prefer possible `cargo build` binaries over PATH binaries
cd "$(dirname "$0")/.." script_dir="$(readlink -f "$(dirname "$0")")"
if [[ "$script_dir" =~ /scripts$ ]]; then
cd "$script_dir/.."
else
cd "$script_dir"
fi
profile=debug profile=debug
if [[ -n $NDEBUG ]]; then if [[ -n $NDEBUG ]]; then