escape_hazard: Rename temp-file vars_org_tmp -> escape_hazard_tmp

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-07-17 03:21:41 +01:00
parent d80040ba09
commit f05fdccd76
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246

View File

@ -941,9 +941,9 @@ escape_hazard() {
working_safe_org_conf=1 working_safe_org_conf=1
# Assign temp-file # Assign temp-file
vars_org_tmp="" escape_hazard_tmp=""
easyrsa_mktemp vars_org_tmp || die \ easyrsa_mktemp escape_hazard_tmp || die \
"escape_hazard - easyrsa_mktemp vars_org_tmp" "escape_hazard - easyrsa_mktemp escape_hazard_tmp"
# write org fields to org temp-file and escape '&' and '$' # write org fields to org temp-file and escape '&' and '$'
print "\ print "\
@ -956,17 +956,17 @@ export EASYRSA_REQ_EMAIL=\"$EASYRSA_REQ_EMAIL\"
export EASYRSA_REQ_SERIAL=\"$EASYRSA_REQ_SERIAL\"\ export EASYRSA_REQ_SERIAL=\"$EASYRSA_REQ_SERIAL\"\
" | sed -e s\`'\&'\`'\\\&'\`g \ " | sed -e s\`'\&'\`'\\\&'\`g \
-e s\`'\$'\`'\\\$'\`g \ -e s\`'\$'\`'\\\$'\`g \
> "$vars_org_tmp" || die "\ > "$escape_hazard_tmp" || die "\
escape_hazard - Failed to write temp-file" escape_hazard - Failed to write temp-file"
# Reload fields from fully escaped temp-file # Reload fields from fully escaped temp-file
# shellcheck disable=SC1090 # can't follow ... # shellcheck disable=SC1090 # can't follow ...
(. "$vars_org_tmp") || die "\ (. "$escape_hazard_tmp") || die "\
escape_hazard - Failed to source temp-file" escape_hazard - Failed to source temp-file"
verbose "escape_hazard: COMPLETED" verbose "escape_hazard: COMPLETED"
# shellcheck disable=SC1090 # can't follow ... # shellcheck disable=SC1090 # can't follow ...
. "$vars_org_tmp" . "$escape_hazard_tmp"
} # => escape_hazard() } # => escape_hazard()
# Replace environment variable names with current value # Replace environment variable names with current value