From d642125f6802c9a215d896d6047b188af5df613d Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 30 May 2019 13:44:27 -0700
Subject: [PATCH] publish-crate fixups

---
 bench-exchange/Cargo.toml         | 1 +
 ci/order-crates-for-publishing.py | 2 +-
 ci/publish-crate.sh               | 2 +-
 upload-perf/Cargo.toml            | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml
index 2e1976f8e..272ddec37 100644
--- a/bench-exchange/Cargo.toml
+++ b/bench-exchange/Cargo.toml
@@ -6,6 +6,7 @@ version = "0.16.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
+publish = false
 
 [dependencies]
 bincode = "1.1.4"
diff --git a/ci/order-crates-for-publishing.py b/ci/order-crates-for-publishing.py
index 5a6bc2f7a..b49a7df72 100755
--- a/ci/order-crates-for-publishing.py
+++ b/ci/order-crates-for-publishing.py
@@ -26,7 +26,7 @@ def get_packages():
     dependency_graph = dict()
     for pkg in metadata['packages']:
         manifest_path[pkg['name']] = pkg['manifest_path'];
-        dependency_graph[pkg['name']] = [x['name'] for x in pkg['dependencies'] if x['name'].startswith('solana-')];
+        dependency_graph[pkg['name']] = [x['name'] for x in pkg['dependencies'] if x['name'].startswith('solana')];
 
     # Check for direct circular dependencies
     circular_dependencies = set()
diff --git a/ci/publish-crate.sh b/ci/publish-crate.sh
index 6426f8df6..07db61655 100755
--- a/ci/publish-crate.sh
+++ b/ci/publish-crate.sh
@@ -21,7 +21,7 @@ cargoCommand="cargo publish --token $CRATES_IO_TOKEN"
 
 Cargo_tomls=$(ci/order-crates-for-publishing.py)
 
-for Cargo_toml in "${Cargo_tomls[@]}"; do
+for Cargo_toml in $Cargo_tomls; do
   echo "-- $Cargo_toml"
   grep -q "^version = \"$expectedCrateVersion\"$" "$Cargo_toml" || {
     echo "Error: $Cargo_toml version is not $expectedCrateVersion"
diff --git a/upload-perf/Cargo.toml b/upload-perf/Cargo.toml
index 5795ab095..baf558c62 100644
--- a/upload-perf/Cargo.toml
+++ b/upload-perf/Cargo.toml
@@ -7,6 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 edition = "2018"
 homepage = "https://solana.com/"
+publish = false
 
 [dependencies]
 log = "0.4.2"