Merge pull request #211 from lavalamp/test_fix

Fix jq detection (tested, works)
This commit is contained in:
brendandburns 2014-06-23 19:43:51 -07:00
commit 91c8828cd7

View File

@ -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)/.."