diff options
author | Tad Fisher <tadfisher@gmail.com> | 2018-06-28 15:51:29 -0700 |
---|---|---|
committer | Tad Fisher <tadfisher@gmail.com> | 2018-06-28 15:51:29 -0700 |
commit | 7d7a9afc48562ac292e6847ebe834ed673e83ebd (patch) | |
tree | 94ceab018dfbe48cbf4f0de452e3766d94d32242 /test/setup.sh | |
parent | 9edb479405156f5712dd101661b86bd599904e8d (diff) | |
parent | 5fb4620b087a34c93b8f67874992dcc6409f7fcc (diff) |
Merge branch 'develop' into master
Diffstat (limited to 'test/setup.sh')
-rw-r--r-- | test/setup.sh | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/test/setup.sh b/test/setup.sh index f407164..5fd7173 100644 --- a/test/setup.sh +++ b/test/setup.sh @@ -27,8 +27,9 @@ unset EDITOR # We must be called from test/ TEST_HOME="$(pwd)" -EXT_HOME="$(dirname $TEST_HOME)" +EXT_HOME="$(dirname "$TEST_HOME")" +# shellcheck disable=SC1091 . ./sharness.sh export PASSWORD_STORE_ENABLE_EXTENSIONS=true @@ -41,29 +42,33 @@ export GIT_WORK_TREE="$PASSWORD_STORE_DIR" git config --global user.email "Pass-Automated-Testing-Suite@zx2c4.com" git config --global user.name "Pass Automated Testing Suite" -PASS=`which pass` -if [[ ! -e $PASS ]]; then - echo "Could not find pass command" - exit 1 -fi +PASS=$(which pass) +[[ -e $PASS ]] || error "Could not find pass command" + +EXPECT=$(which expect) +[[ -e $EXPECT ]] || error "Could not find expect command" + +OAUTHTOOL=$(which oathtool) +[[ -e $OAUTHTOOL ]] || error "Could not find oathtool command" + +GPG=$(which gpg2) || GPG=$(which gpg) +[[ -e $GPG ]] || error "Could not find gpg command" # Note: the assumption is the test key is unencrypted. export GNUPGHOME="$TEST_HOME/gnupg/" chmod 700 "$GNUPGHOME" -GPG="gpg" -which gpg2 &>/dev/null && GPG="gpg2" # We don't want any currently running agent to conflict. unset GPG_AGENT_INFO -KEY1="CF90C77B" # pass test key 1 -KEY2="D774A374" # pass test key 2 -KEY3="EB7D54A8" # pass test key 3 -KEY4="E4691410" # pass test key 4 -KEY5="39E5020C" # pass test key 5 +KEY[1]="CF90C77B" # pass test key 1 +KEY[2]="D774A374" # pass test key 2 +KEY[3]="EB7D54A8" # pass test key 3 +KEY[4]="E4691410" # pass test key 4 +KEY[5]="39E5020C" # pass test key 5 # Test helpers test_pass_init() { rm -rf "$PASSWORD_STORE_DIR" - "$PASS" init "$KEY1" + "$PASS" init "${KEY[@]}" } |