From b4d4edb645d4574bc9e1c871c6ffa9610f2d5baf Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 10 Jun 2019 18:49:08 -0700
Subject: [PATCH] Restore cargo install to work around --features= 'feature'
 (#4627)

---
 scripts/cargo-install-all.sh | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh
index 52b4940dd3..3102efe27f 100755
--- a/scripts/cargo-install-all.sh
+++ b/scripts/cargo-install-all.sh
@@ -29,27 +29,26 @@ SECONDS=0
   cargo $rust_version build --all --release --features="$cargoFeatures"
 )
 
-PROGRAMS=(
-  solana-drone
-  solana-genesis
-  solana-gossip
-  solana-install
-  solana-install-init
-  solana-keygen
-  solana-ledger-tool
-  solana-replicator
-  solana-validator
-  solana-wallet
-  solana-bench-exchange
-  solana-bench-streamer
-  solana-bench-tps
+BIN_CRATES=(
+  drone
+  genesis
+  gossip
+  install
+  keygen
+  ledger-tool
+  replicator
+  validator
+  wallet
+  bench-exchange
+  bench-streamer
+  bench-tps
 )
 
-for program in "${PROGRAMS[@]}"; do
+for crate in "${BIN_CRATES[@]}"; do
   (
     set -x
-    mkdir -p "$installDir"/bin
-    cp target/release/"$program" "$installDir"/bin
+    # shellcheck disable=SC2086 # Don't want to double quote $rust_version
+    cargo $rust_version install --force --path "$crate" --root "$installDir" --features="$cargoFeatures"
   )
 done