From ab208ddb77b6a3f3445ab5a323a88153bbec9f96 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 7 Sep 2018 08:46:20 -0700
Subject: [PATCH] Clean up arg handling

---
 net/remote/remote-client.sh | 13 +++++++++----
 net/remote/remote-node.sh   | 17 +++++++++++------
 net/remote/remote-sanity.sh | 18 +++++++-----------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/net/remote/remote-client.sh b/net/remote/remote-client.sh
index b38cba44ae..75d2c3db77 100755
--- a/net/remote/remote-client.sh
+++ b/net/remote/remote-client.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
 cd "$(dirname "$0")"/../..
 
@@ -7,9 +7,14 @@ entrypointIp="$2"
 numNodes="$3"
 RUST_LOG="$4"
 
-[[ -n $deployMethod ]] || exit
-[[ -n $entrypointIp ]] || exit
-[[ -n $numNodes ]] || exit
+missing() {
+  echo "Error: $1 not specified"
+  exit 1
+}
+
+[[ -n $deployMethod ]] || missing deployMethod
+[[ -n $entrypointIp ]] || missing entrypointIp
+[[ -n $numNodes ]]     || missing numNodes
 
 source net/common.sh
 loadConfigFile
diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
index 28c3877f60..0d7567ebec 100755
--- a/net/remote/remote-node.sh
+++ b/net/remote/remote-node.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
 cd "$(dirname "$0")"/../..
 
@@ -9,11 +9,16 @@ entrypointIp="$4"
 numNodes="$5"
 RUST_LOG="$6"
 
-[[ -n $deployMethod ]] || exit
-[[ -n $nodeType ]] || exit
-[[ -n $publicNetwork ]] || exit
-[[ -n $entrypointIp ]] || exit
-[[ -n $numNodes ]] || exit
+missing() {
+  echo "Error: $1 not specified"
+  exit 1
+}
+
+[[ -n $deployMethod ]]  || missing deployMethod
+[[ -n $nodeType ]]      || missing nodeType
+[[ -n $publicNetwork ]] || missing publicNetwork
+[[ -n $entrypointIp ]]  || missing entrypointIp
+[[ -n $numNodes ]]      || missing numNodes
 
 cat > deployConfig <<EOF
 deployMethod="$deployMethod"
diff --git a/net/remote/remote-sanity.sh b/net/remote/remote-sanity.sh
index 3e2b542662..b71be35d38 100755
--- a/net/remote/remote-sanity.sh
+++ b/net/remote/remote-sanity.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 #
 # This script is to be run on the leader node
 #
@@ -16,19 +16,15 @@ numNodes=
 # shellcheck source=/dev/null # deployConfig is written by remote-node.sh
 source deployConfig
 
-[[ -n $deployMethod ]] || {
-  echo deployMethod empty
-  exit 1
-}
-[[ -n $entrypointIp ]] || {
-  echo entrypointIp empty
-  exit 1
-}
-[[ -n $numNodes ]] || {
-  echo numNodes empty
+missing() {
+  echo "Error: $1 not specified"
   exit 1
 }
 
+[[ -n $deployMethod ]] || missing deployMethod
+[[ -n $entrypointIp ]] || missing entrypointIp
+[[ -n $numNodes ]]     || missing numNodes
+
 ledgerVerify=true
 validatorSanity=true
 while [[ $1 = -o ]]; do