nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'follow_symblink' of https://github.com/luizluca/easy-rsa into luizluca-follow_symblink

Browse Source
This commit is contained in:
Eric F Crist 2019-05-06 21:46:25 -05:00
commit d38f545de1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
easyrsa3/easyrsa
View File

@ -1439,7 +1439,11 @@ vars_setup() {
vars= vars=
# set up program path # set up program path
prog_vars="${0%/*}/vars" prog_file="$0"
prog_file2="$(which -- "$prog_file" 2>/dev/null)" && prog_file="$prog_file2"
prog_file2="$(readlink -f "$prog_file" 2>/dev/null)" && prog_file="$prog_file2"
prog_dir="${prog_file%/*}"
prog_vars="${prog_dir}/vars"
# set up PKI path # set up PKI path
pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars" pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars"
@ -1469,7 +1473,7 @@ Note: using Easy-RSA configuration from: $vars"
fi fi
# Set defaults, preferring existing env-vars if present # Set defaults, preferring existing env-vars if present
set_var EASYRSA "${0%/*}" set_var EASYRSA "$prog_dir"
set_var EASYRSA_OPENSSL openssl set_var EASYRSA_OPENSSL openssl
set_var EASYRSA_PKI "$PWD/pki" set_var EASYRSA_PKI "$PWD/pki"
set_var EASYRSA_DN cn_only set_var EASYRSA_DN cn_only