|
@@ -29,7 +29,7 @@ usage() {
|
|
|
echo "Error: $*"
|
|
echo "Error: $*"
|
|
|
fi
|
|
fi
|
|
|
cat <<EOF
|
|
cat <<EOF
|
|
|
-usage: $0 [+<cargo version>] [--debug] [--validator-only] [--release-with-debug] <install directory>
|
|
|
|
|
|
|
+usage: $0 [+<cargo version>] [--debug] [--validator-only] [--release-with-debug] [--no-spl-token] <install directory>
|
|
|
EOF
|
|
EOF
|
|
|
exit $exitcode
|
|
exit $exitcode
|
|
|
}
|
|
}
|
|
@@ -42,6 +42,7 @@ installDir=
|
|
|
buildProfileArg='--profile release'
|
|
buildProfileArg='--profile release'
|
|
|
buildProfile='release'
|
|
buildProfile='release'
|
|
|
validatorOnly=
|
|
validatorOnly=
|
|
|
|
|
+noSPLToken=
|
|
|
|
|
|
|
|
while [[ -n $1 ]]; do
|
|
while [[ -n $1 ]]; do
|
|
|
if [[ ${1:0:1} = - ]]; then
|
|
if [[ ${1:0:1} = - ]]; then
|
|
@@ -60,6 +61,9 @@ while [[ -n $1 ]]; do
|
|
|
elif [[ $1 = --validator-only ]]; then
|
|
elif [[ $1 = --validator-only ]]; then
|
|
|
validatorOnly=true
|
|
validatorOnly=true
|
|
|
shift
|
|
shift
|
|
|
|
|
+ elif [[ $1 = --no-spl-token ]]; then
|
|
|
|
|
+ noSPLToken=true
|
|
|
|
|
+ shift
|
|
|
else
|
|
else
|
|
|
usage "Unknown option: $1"
|
|
usage "Unknown option: $1"
|
|
|
fi
|
|
fi
|
|
@@ -163,8 +167,8 @@ check_dcou() {
|
|
|
cargo_build "${dcouBinArgs[@]}"
|
|
cargo_build "${dcouBinArgs[@]}"
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
- # Exclude `spl-token` binary for net.sh builds
|
|
|
|
|
- if [[ -z "$validatorOnly" ]]; then
|
|
|
|
|
|
|
+ # Exclude `spl-token` if requested
|
|
|
|
|
+ if [[ -z "$noSPLToken" ]]; then
|
|
|
# shellcheck source=scripts/spl-token-cli-version.sh
|
|
# shellcheck source=scripts/spl-token-cli-version.sh
|
|
|
source "$SOLANA_ROOT"/scripts/spl-token-cli-version.sh
|
|
source "$SOLANA_ROOT"/scripts/spl-token-cli-version.sh
|
|
|
|
|
|