From e8e6c70e19d0ef804d0630e7fc645923e381cfac Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 18 Dec 2018 14:25:10 -0800
Subject: [PATCH] Remove duplicate _ definitions

---
 ci/audit.sh         | 10 +---------
 ci/publish-book.sh  |  5 -----
 ci/test-bench.sh    |  7 +------
 ci/test-checks.sh   |  7 ++-----
 ci/test-stable.sh   |  6 +-----
 scripts/coverage.sh |  6 +-----
 6 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/ci/audit.sh b/ci/audit.sh
index 2511916a7f..e8ff169805 100755
--- a/ci/audit.sh
+++ b/ci/audit.sh
@@ -5,15 +5,7 @@
 set -e
 
 cd "$(dirname "$0")/.."
-
-export RUST_BACKTRACE=1
-rustc --version
-cargo --version
-
-_() {
-  echo "--- $*"
-  "$@"
-}
+source ci/_
 
 cargo_install_unless() {
   declare crate=$1
diff --git a/ci/publish-book.sh b/ci/publish-book.sh
index c7ea4ec2fe..47cf1dd377 100755
--- a/ci/publish-book.sh
+++ b/ci/publish-book.sh
@@ -3,11 +3,6 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-_() {
-  echo "--- $*"
-  "$@"
-}
-
 book/build.sh
 
 echo --- create book repo
diff --git a/ci/test-bench.sh b/ci/test-bench.sh
index 39289c57e1..79b616e3e2 100755
--- a/ci/test-bench.sh
+++ b/ci/test-bench.sh
@@ -3,17 +3,12 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-# shellcheck disable=SC1091
+source ci/_
 source ci/upload-ci-artifact.sh
 
 eval "$(ci/channel-info.sh)"
 ci/version-check-with-upgrade.sh nightly
 
-_() {
-  echo "--- $*"
-  "$@"
-}
-
 set -o pipefail
 export RUST_BACKTRACE=1
 
diff --git a/ci/test-checks.sh b/ci/test-checks.sh
index 92b6b15326..f817498f3e 100755
--- a/ci/test-checks.sh
+++ b/ci/test-checks.sh
@@ -3,15 +3,12 @@ set -e
 
 cd "$(dirname "$0")/.."
 
+source ci/_
 ci/version-check.sh stable
+
 export RUST_BACKTRACE=1
 export RUSTFLAGS="-D warnings"
 
-_() {
-  echo "--- $*"
-  "$@"
-}
-
 _ cargo fmt --all -- --check
 _ cargo clippy --all -- --version
 _ cargo clippy --all -- --deny=warnings
diff --git a/ci/test-stable.sh b/ci/test-stable.sh
index 0abead7be1..ed9c386e91 100755
--- a/ci/test-stable.sh
+++ b/ci/test-stable.sh
@@ -8,15 +8,11 @@ cd "$(dirname "$0")/.."
 # Clear cached json keypair files
 rm -rf "$HOME/.config/solana"
 
+source ci/_
 ci/version-check-with-upgrade.sh stable
 export RUST_BACKTRACE=1
 export RUSTFLAGS="-D warnings"
 
-_() {
-  echo "--- $*"
-  "$@"
-}
-
 _ scripts/ulimit-n.sh
 _ cargo build --all --verbose --features="$FEATURES"
 _ cargo test --all --verbose - --features="$FEATURES" --lib -- --nocapture --test-threads=1
diff --git a/scripts/coverage.sh b/scripts/coverage.sh
index 94c0df77a6..5c07b211fa 100755
--- a/scripts/coverage.sh
+++ b/scripts/coverage.sh
@@ -7,11 +7,7 @@
 
 set -e
 cd "$(dirname "$0")/.."
-
-_() {
-  echo "--- $*"
-  "$@"
-}
+source ci/_
 
 : "${BUILDKITE_COMMIT:=local}"
 reportName="lcov-${BUILDKITE_COMMIT:0:9}"