fix: inline testnet-default-channel.js

solana-labs · Jun 15, 2020 · b4c80b1 · b4c80b1
1 parent 6b68e2d
commit b4c80b1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git 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
@@ -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