Fix Shellcheck SC2166: test -a is not well defined

Prefer [ p ] && [ q ] as [ p -a q ] is not well defined.

https://github.com/koalaman/shellcheck/wiki/SC2166



Signed-off-by: Dan Callahan <danc@element.io>