From a76eb64bbba0e514cdb026f66d2c0e05b1373b83 Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Wed, 20 Nov 2019 14:37:15 -0800
Subject: [PATCH] Copy all programs when starting a network (#7069)

---
 scripts/cargo-install-all.sh             | 22 +++-------------------
 scripts/cargo-install-custom-programs.sh | 15 +++------------
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh
index ff1d523801..97186ab952 100755
--- a/scripts/cargo-install-all.sh
+++ b/scripts/cargo-install-all.sh
@@ -109,24 +109,8 @@ if [[ -d target/perf-libs ]]; then
   cp -a target/perf-libs "$installDir"/bin/perf-libs
 fi
 
-for dir in programs/*; do
-  for program in echo target/$buildVariant/deps/libsolana_"$(basename "$dir")".{so,dylib,dll}; do
-    if [[ -f $program ]]; then
-      mkdir -p "$installDir/bin/deps"
-      rm -f "$installDir/bin/deps/$(basename "$program")"
-      cp -v "$program" "$installDir"/bin/deps
-    fi
-  done
-done
-
-for dir in programs/*; do
-  for program in echo programs/"$(basename "$dir")"/target/$buildVariant/deps/libsolana_"$(basename "$dir")".{so,dylib,dll}; do
-    if [[ -f $program ]]; then
-      mkdir -p "$installDir/bin/deps"
-      rm -f "$installDir/bin/deps/$(basename "$program")"
-      cp -v "$program" "$installDir"/bin/deps
-    fi
-  done
-done
+set -x
+mkdir -p "$installDir/bin/deps"
+cp -fv "target/release/deps/libsolana*program.*" "$installDir/bin/deps"
 
 echo "Done after $SECONDS seconds"
diff --git a/scripts/cargo-install-custom-programs.sh b/scripts/cargo-install-custom-programs.sh
index 5c9e0d09b4..e56c18f037 100755
--- a/scripts/cargo-install-custom-programs.sh
+++ b/scripts/cargo-install-custom-programs.sh
@@ -16,15 +16,6 @@ programDir="$2"
   cargo build --release
 )
 
-for dir in "$programDir"/*; do
-  for program in $programDir/target/release/deps/lib"$(basename "$dir")".{so,dylib,dll}; do
-    if [[ -f $program ]]; then
-      (
-        set -x
-        mkdir -p "$installDir/bin/deps"
-        rm -f "$installDir/bin/deps/$(basename "$program")"
-        cp -v "$program" "$installDir"/bin/deps
-      )
-    fi
-  done
-done
+set -x
+mkdir -p "$installDir/bin/deps"
+cp -fv "$programDir/target/release/deps/libsolana*program.*" "$installDir/bin/deps"