Merge branch 'master' of https://github.com/rolfchess/easy-rsa into rolfchess-master

This commit is contained in:
Eric F Crist 2020-01-11 16:10:31 -06:00
commit 5eec79de29
No known key found for this signature in database
GPG Key ID: 72964219390D0D0E

View File

@ -1600,7 +1600,11 @@ vars_setup() {
pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars"
# command-line path:
if [ -f "$EASYRSA_VARS_FILE" ]; then
if [ ! -z "$EASYRSA_VARS_FILE" ]; then
if [ ! -f "$EASYRSA_VARS_FILE" ]; then
# If the --vars option does not point to a file, show helpful error.
die "The file '$EASYRSA_VARS_FILE' was not found."
fi
vars="$EASYRSA_VARS_FILE"
# PKI location, if present:
elif [ -f "$pki_vars" ]; then