nihilist/acme.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: revert _readini() function to be more generic

Browse Source 
Also switched [::space::] with a literal space for better
cross-platform compatibility.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
This commit is contained in:
Avi Miller 2021-06-20 13:12:14 +10:00
parent 946c8b498a
commit 7666022840
No known key found for this signature in database
GPG Key ID: 66D6066620F03B05
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dnsapi/dns_oci.sh
View File

@ -83,14 +83,14 @@ _oci_config() {
OCI_CLI_CONFIG_FILE="${OCI_CLI_CONFIG_FILE:-$HOME/.oci/config}" OCI_CLI_CONFIG_FILE="${OCI_CLI_CONFIG_FILE:-$HOME/.oci/config}"
OCI_CLI_PROFILE="${OCI_CLI_PROFILE:-DEFAULT}" OCI_CLI_PROFILE="${OCI_CLI_PROFILE:-DEFAULT}"
# Let's try and find the values automagically first # Read the configuration from either the default or specified config file
# But still let any environment variables take precendence # Override the config file value with the environment variable value (if set)
if [ -f "$OCI_CLI_CONFIG_FILE" ]; then if [ -f "$OCI_CLI_CONFIG_FILE" ]; then
_info "Reading OCI configuration file: $(_green "$OCI_CLI_CONFIG_FILE")" _info "Reading OCI configuration file: $OCI_CLI_CONFIG_FILE"
OCI_CLI_TENANCY="${OCI_CLI_TENANCY:-$(_read_oci_config tenancy)}" OCI_CLI_TENANCY="${OCI_CLI_TENANCY:-$(_readini tenancy "$OCI_CLI_CONFIG_FILE" "$OCI_CLI_PROFILE")}"
OCI_CLI_USER="${OCI_CLI_USER:-$(_read_oci_config user)}" OCI_CLI_USER="${OCI_CLI_USER:-$(_readini user "$OCI_CLI_CONFIG_FILE" "$OCI_CLI_PROFILE")}"
OCI_CLI_KEY_FILE="${OCI_CLI_KEY_FILE:-$(_read_oci_config key_file)}" OCI_CLI_KEY_FILE="${OCI_CLI_KEY_FILE:-$(_readini key_file "$OCI_CLI_CONFIG_FILE" "$OCI_CLI_PROFILE")}"
OCI_CLI_REGION="${OCI_CLI_REGION:-$(_read_oci_config region)}" OCI_CLI_REGION="${OCI_CLI_REGION:-$(_readini region "$OCI_CLI_CONFIG_FILE" "$OCI_CLI_PROFILE")}"
else else
OCI_CLI_TENANCY="${OCI_CLI_TENANCY:-$(_readaccountconf_mutable OCI_CLI_TENANCY)}" OCI_CLI_TENANCY="${OCI_CLI_TENANCY:-$(_readaccountconf_mutable OCI_CLI_TENANCY)}"
OCI_CLI_USER="${OCI_CLI_USER:-$(_readaccountconf_mutable OCI_CLI_USER)}" OCI_CLI_USER="${OCI_CLI_USER:-$(_readaccountconf_mutable OCI_CLI_USER)}"
@ -271,20 +271,22 @@ _signed_request() {
} }
# file key [section] # file key [section]
_read_oci_config() { _readini() {
_key="$1" _key="$1"
_file="$2"
_section="${3:-DEFAULT}"
_start_n=$(grep -n '\['"$OCI_CLI_PROFILE"']' "$OCI_CLI_CONFIG_FILE" | cut -d : -f 1) _start_n=$(grep -n '\['"$_section"']' "$_file" | cut -d : -f 1)
_debug2 _start_n "$_start_n" _debug2 _start_n "$_start_n"
if [ -z "$_start_n" ]; then if [ -z "$_start_n" ]; then
_err "Can not find section: $OCI_CLI_PROFILE" _err "Can not find section: $_section"
return 1 return 1
fi fi
_start_nn=$(_math "$_start_n" + 1) _start_nn=$(_math "$_start_n" + 1)
_debug2 "_start_nn" "$_start_nn" _debug2 "_start_nn" "$_start_nn"
_left="$(sed -n "${_start_nn},99999p" "$OCI_CLI_CONFIG_FILE")" _left="$(sed -n "${_start_nn},99999p" "$_file")"
_debug2 _left "$_left" _debug2 _left "$_left"
_end="$(echo "$_left" | grep -n "^\[" | _head_n 1)" _end="$(echo "$_left" | grep -n "^\[" | _head_n 1)"
_debug2 "_end" "$_end" _debug2 "_end" "$_end"
@ -300,6 +302,6 @@ _read_oci_config() {
_lineini="$(echo "$_seg_n" | grep "^ *$_key *= *")" _lineini="$(echo "$_seg_n" | grep "^ *$_key *= *")"
_debug2 "_lineini" "$_lineini" _debug2 "_lineini" "$_lineini"
printf "%b" "$(eval "echo $_lineini | sed -e \"s/${_key}[[:space:]]*=[[:space:]]*//g\"")" printf "%b" "$(eval "echo $_lineini | sed -e \"s/^ *${_key} *= *//g\"")"
} }