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

Merge branch 'trim-find_x509_types_dir' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-trim-find_x509_types_dir

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-10-27 17:43:58 +01:00
commit cf489e3fb0
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
easyrsa3/easyrsa
View File

@ -1077,20 +1077,6 @@ find_x509_types_dir() {
[ -d "$EASYRSA_EXT_DIR" ] || unset -v EASYRSA_EXT_DIR [ -d "$EASYRSA_EXT_DIR" ] || unset -v EASYRSA_EXT_DIR
x509_types_dir='x509-types' x509_types_dir='x509-types'
# if PKI/x509-types exists then it wins, except for command line
if [ -d "$EASYRSA_PKI/$x509_types_dir" ]; then
# use set_var to preserve command line
set_var EASYRSA_EXT_DIR "$EASYRSA_PKI/$x509_types_dir"
return
fi
# if PKI/x509-types exists then it wins, except for command line
if [ -d "$PWD/pki/$x509_types_dir" ]; then
# use set_var to preserve command line
set_var EASYRSA_EXT_DIR "$PWD/pki/$x509_types_dir"
return
fi
# Find x509-types dir, in specific order # Find x509-types dir, in specific order
for area in \ for area in \
"$EASYRSA_PKI" \ "$EASYRSA_PKI" \
@ -1103,14 +1089,14 @@ find_x509_types_dir() {
# EOL # EOL
do do
# Find x509-types # Find x509-types
[ -e "${area}/$x509_types_dir" ] || continue [ -e "${area}/${x509_types_dir}" ] || continue
# Declare in preferred order, first wins, beaten by command line. # Declare in preferred order, first wins, beaten by command line.
set_var EASYRSA_EXT_DIR "${area}/$x509_types_dir" set_var EASYRSA_EXT_DIR "${area}/${x509_types_dir}"
done done
# EASYRSA_EXT_DIR must be defined # EASYRSA_EXT_DIR must be defined
[ -d "${EASYRSA_EXT_DIR}" ] || return [ -d "$EASYRSA_EXT_DIR" ] && return
} # => find_x509_types_dir() } # => find_x509_types_dir()
# Copy data-files from various sources # Copy data-files from various sources