From 05491f7fb73ca9844d1b64a47dfc33d18b7a1ad3 Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Mon, 6 Jan 2020 15:47:19 -0800
Subject: [PATCH] fix: use testnetDefaultChannel when install bpf-sdk

---
 web3.js/bin/bpf-sdk-install.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/web3.js/bin/bpf-sdk-install.sh b/web3.js/bin/bpf-sdk-install.sh
index b89b682517..d934a22be8 100755
--- a/web3.js/bin/bpf-sdk-install.sh
+++ b/web3.js/bin/bpf-sdk-install.sh
@@ -10,11 +10,12 @@ channel=$(
   cd "$(dirname "$0")";
   node -p '
     let p = [
+      "../../package.json",
       "../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");
+    if (!p) throw new Error("Unable to locate package.json");
     require(p)["testnetDefaultChannel"]
   '
 )
@@ -22,10 +23,6 @@ channel=$(
 if [[ -n $2 ]]; then
   channel=$2
 fi
-[[ $channel = edge || $channel = beta ]] || {
-  echo "Error: Invalid channel: $channel"
-  exit 1
-}
 
 echo "Installing $channel BPF SDK into $installDir"