diff --git a/web3.js/bin/bpf-sdk-install.sh b/web3.js/bin/bpf-sdk-install.sh index 6b11300a25..b89b682517 100755 --- a/web3.js/bin/bpf-sdk-install.sh +++ b/web3.js/bin/bpf-sdk-install.sh @@ -6,7 +6,19 @@ if [[ -z $installDir ]]; then installDir="$(cd "$(dirname "$0")"/..; pwd)" fi -channel=$("$(dirname "$0")"/testnet-default-channel.js) +channel=$( + cd "$(dirname "$0")"; + node -p ' + let p = [ + "../lib/node_modules/@solana/web3.js/package.json", + "../@solana/web3.js/package.json", + "../package.json" + ].find(require("fs").existsSync); + if (!p) throw new Error("Unable to locate solana-web3.js directory"); + require(p)["testnetDefaultChannel"] + ' +) + if [[ -n $2 ]]; then channel=$2 fi diff --git a/web3.js/bin/localnet.sh b/web3.js/bin/localnet.sh index f6c08e3599..53b5cf8f19 100755 --- a/web3.js/bin/localnet.sh +++ b/web3.js/bin/localnet.sh @@ -1,7 +1,18 @@ #!/usr/bin/env bash set -e -channel=$("$(dirname "$0")"/testnet-default-channel.js) +channel=$( + cd "$(dirname "$0")"; + node -p ' + let p = [ + "../lib/node_modules/@solana/web3.js/package.json", + "../@solana/web3.js/package.json", + "../package.json" + ].find(require("fs").existsSync); + if (!p) throw new Error("Unable to locate solana-web3.js directory"); + require(p)["testnetDefaultChannel"] + ' +) usage() { exitcode=0 diff --git a/web3.js/bin/testnet-default-channel.js b/web3.js/bin/testnet-default-channel.js deleted file mode 100755 index a426aea93c..0000000000 --- a/web3.js/bin/testnet-default-channel.js +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env node - -let p = [ - __dirname + '/../lib/node_modules/@solana/web3.js/package.json', - __dirname + '/../@solana/web3.js/package.json', - __dirname + '/../package.json' -].find(require('fs').existsSync); -if (!p) throw new Error('Unable to locate solana-web3.js directory'); - -console.log(require(p)['testnetDefaultChannel']);