Skip to content

Commit

Permalink
Fix vault dependency check in bin/testdev
Browse files Browse the repository at this point in the history
The new `vault` plugin interferes with the check for the `vault` binary,
so the path had to be corrected.  Also now accepting any version
matching 0.9.* as a viable vault version.
  • Loading branch information
dennisjbell committed Jul 7, 2018
1 parent ca5588e commit ec83324
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions bin/testdev
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/bash
export PATH=$(pwd):$(pwd)/bin:${PATH}
export VAULT_SKIP_VERIFY=1
workdir=$PWD/tmp/work
storedir=$PWD/tmp/store
Expand Down Expand Up @@ -82,10 +81,10 @@ preflight() {
v=$(vault -v | awk '{print $2}')
case $v in
v0.8.*) ;;
v0.9.0) ;;
v0.9.*) ;;
*) echo
echo "The installed version of vault ($v) has not been verified"
echo "to work with this version of SHIELD testdev. Please try v0.9.0"
echo "to work with this version of SHIELD testdev. Please try v0.9.6"
case $OSTYPE in
*darwin*) echo
echo "On macOS ($OSTYPE), you can \`brew upgrade vault\` and be on your way."
Expand Down Expand Up @@ -310,6 +309,7 @@ auth:
EOF

export PATH=$(pwd):$(pwd)/bin:${PATH}
while true; do
echo ">> Setting up SHIELD schema"
./shield-schema -d ${workdir}/var/shield.db
Expand Down Expand Up @@ -354,6 +354,7 @@ registration:
interval: 15
EOF

export PATH=$(pwd):$(pwd)/bin:${PATH}
while true; do
echo ">> RUNNING SHIELD AGENT"
trap ":" INT # ignore Ctrl-C
Expand Down

0 comments on commit ec83324

Please sign in to comment.