From a4464678486e8ec07d681bee7759e6d4accad665 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Mon, 23 Jun 2014 13:57:05 -0700 Subject: [PATCH] Fix jq detection (tested, works) --- hack/e2e-test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/e2e-test.sh b/hack/e2e-test.sh index eb555056fd0..faca4e9a2b7 100755 --- a/hack/e2e-test.sh +++ b/hack/e2e-test.sh @@ -22,9 +22,6 @@ ALREADY_UP=${1:-0} LEAVE_UP=${2:-0} -# Exit on error -set -e - HAVE_JQ=$(which jq) if [[ -z ${HAVE_JQ} ]]; then echo "Please install jq, e.g.: 'sudo apt-get install jq' or, " @@ -32,6 +29,9 @@ if [[ -z ${HAVE_JQ} ]]; then exit 1 fi +# Exit on error +set -e + # Use testing config export KUBE_CONFIG_FILE="config-test.sh" export KUBE_REPO_ROOT="$(dirname $0)/.."