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

Merge branch 'reuse-select_vars' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-reuse-select_vars

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

25
easyrsa3/easyrsa
View File

@ -1376,6 +1376,8 @@ A vars file has not been created in your new PKI because
conflicting vars files have been found elsewhere." conflicting vars files have been found elsewhere."
prefer_vars_in_pki_msg prefer_vars_in_pki_msg
else else
unset -v EASYRSA_VARS_FILE
select_vars
information " information "
Using Easy-RSA configuration: Using Easy-RSA configuration:
* ${EASYRSA_VARS_FILE:-undefined}" * ${EASYRSA_VARS_FILE:-undefined}"
@ -5678,9 +5680,6 @@ select_vars() {
No Easy-RSA 'vars' configuration file exists!" No Easy-RSA 'vars' configuration file exists!"
EASYRSA_NO_VARS=1 EASYRSA_NO_VARS=1
fi fi
# source the vars file
source_vars "$EASYRSA_VARS_FILE"
} # => select_vars() } # => select_vars()
# Source a vars file # Source a vars file
@ -5754,13 +5753,15 @@ Remove 'unset' ('force_set_var' may also work)."
# Test sourcing 'vars' in a subshell # Test sourcing 'vars' in a subshell
# shellcheck disable=1090 # can't follow .. vars # shellcheck disable=1090 # can't follow .. vars
( . "$target_file" ) || \ if ( . "$target_file" ); then
# Source 'vars' now
# shellcheck disable=1090 # can't follow .. vars
. "$target_file" || \
die "Failed to source the '$target_file' file."
else
PATH="$easyrsa_path"
die "Failed to dry-run the '$target_file' file." die "Failed to dry-run the '$target_file' file."
fi
# Source 'vars' now
# shellcheck disable=1090 # can't follow .. vars
. "$target_file" || \
die "Failed to source the '$target_file' file."
PATH="$easyrsa_path" PATH="$easyrsa_path"
verbose "source_vars: sourced OK '$target_file'" verbose "source_vars: sourced OK '$target_file'"
@ -7218,8 +7219,12 @@ case "$cmd" in
esac esac
# Intelligent env-var detection and auto-loading: # Intelligent env-var detection and auto-loading:
# Select and source vars file # Select vars file as EASYRSA_VARS_FILE
select_vars select_vars
# source the vars file
source_vars "$EASYRSA_VARS_FILE"
# then set defaults # then set defaults
default_vars default_vars