vetted by shfmt

This commit is contained in:
Ed Lynes 2020-08-26 18:07:46 -04:00
parent a0bf29e600
commit 281ee1a853

View File

@ -68,13 +68,14 @@ dns_edgedns_add() {
_debug3 "existing TXT found" _debug3 "existing TXT found"
_debug3 "record data" "$rdlist" _debug3 "record data" "$rdlist"
# value already there? # value already there?
if _contains "$rdlist" "$txtvalue" ; then if _contains "$rdlist" "$txtvalue"; then
return 0 return 0
fi fi
_txt_val="" _txt_val=""
while [ "$_txt_val" != "$rdlist" ] && [ "${rdlist}" ]; do while [ "$_txt_val" != "$rdlist" ] && [ "${rdlist}" ]; do
_txt_val="${rdlist%%,*}"; rdlist="${rdlist#*,}" _txt_val="${rdlist%%,*}"
rdata="${rdata},\"${_txt_val}\"" rdlist="${rdlist#*,}"
rdata="${rdata},\"${_txt_val}\""
done done
fi fi
# Add the txtvalue TXT Record # Add the txtvalue TXT Record
@ -139,10 +140,11 @@ dns_edgedns_rm() {
rdata="" rdata=""
_txt_val="" _txt_val=""
while [ "$_txt_val" != "$rdlist" ] && [ "$rdlist" ]; do while [ "$_txt_val" != "$rdlist" ] && [ "$rdlist" ]; do
_txt_val="${rdlist%%,*}"; rdlist="${rdlist#*,}" _txt_val="${rdlist%%,*}"
rdlist="${rdlist#*,}"
_debug3 "_txt_val" "$_txt_val" _debug3 "_txt_val" "$_txt_val"
_debug3 "txtvalue" "$txtvalue" _debug3 "txtvalue" "$txtvalue"
if ! _contains "$_txt_val" "$txtvalue" ; then if ! _contains "$_txt_val" "$txtvalue"; then
rdata="${rdata}${comma}\"${_txt_val}\"" rdata="${rdata}${comma}\"${_txt_val}\""
comma="," comma=","
fi fi
@ -216,7 +218,7 @@ _EDGEDNS_credentials() {
_saveaccountconf_mutable AKAMAI_CLIENT_SECRET "$AKAMAI_CLIENT_SECRET" _saveaccountconf_mutable AKAMAI_CLIENT_SECRET "$AKAMAI_CLIENT_SECRET"
# Set whether curl should use secure or insecure mode # Set whether curl should use secure or insecure mode
fi fi
export HTTPS_INSECURE=0 # All Edgegrid API calls are secure export HTTPS_INSECURE=0 # All Edgegrid API calls are secure
edge_endpoint=$(printf "https://%s/config-dns/v2/zones" "$AKAMAI_HOST") edge_endpoint=$(printf "https://%s/config-dns/v2/zones" "$AKAMAI_HOST")
_debug3 "Edge API Endpoint:" "$edge_endpoint" _debug3 "Edge API Endpoint:" "$edge_endpoint"
@ -244,7 +246,7 @@ _EDGEDNS_getZoneInfo() {
return 1 return 1
fi fi
fi fi
if _contains "$curResult" "\"zone\":" ; then if _contains "$curResult" "\"zone\":"; then
_debug2 "Zone data" "${curResult}" _debug2 "Zone data" "${curResult}"
zone=$(echo "${curResult}" | _egrep_o "\"zone\"\\s*:\\s*\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d "\"") zone=$(echo "${curResult}" | _egrep_o "\"zone\"\\s*:\\s*\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d "\"")
_debug3 "Zone" "${zone}" _debug3 "Zone" "${zone}"
@ -283,7 +285,7 @@ _edgedns_rest() {
# Set in acme.sh _post/_get # Set in acme.sh _post/_get
#_edgedns_headers="${_edgedns_headers}${tab}User-Agent:ACME DNSAPI Edge DNS version ${ACME_EDGEDNS_VERSION}" #_edgedns_headers="${_edgedns_headers}${tab}User-Agent:ACME DNSAPI Edge DNS version ${ACME_EDGEDNS_VERSION}"
_edgedns_headers="${_edgedns_headers}${tab}Accept: application/json,*/*" _edgedns_headers="${_edgedns_headers}${tab}Accept: application/json,*/*"
if [ "$m" != "GET" ] && [ "$m" != "DELETE" ] ; then if [ "$m" != "GET" ] && [ "$m" != "DELETE" ]; then
_edgedns_content_type="application/json" _edgedns_content_type="application/json"
_debug3 "_request_body" "$_request_body" _debug3 "_request_body" "$_request_body"
_body_len=$(echo "$_request_body" | tr -d "\n\r" | awk '{print length}') _body_len=$(echo "$_request_body" | tr -d "\n\r" | awk '{print length}')
@ -296,10 +298,11 @@ _edgedns_rest() {
work_header="${_edgedns_headers}${tab}" work_header="${_edgedns_headers}${tab}"
_debug3 "work_header" "$work_header" _debug3 "work_header" "$work_header"
while [ "$work_header" ]; do while [ "$work_header" ]; do
entry="${work_header%%\\t*}"; work_header="${work_header#*\\t}" entry="${work_header%%\\t*}"
work_header="${work_header#*\\t}"
export "$(printf "_H%s=%s" "$hdr_indx" "$entry")" export "$(printf "_H%s=%s" "$hdr_indx" "$entry")"
_debug2 "Request Header " "$entry" _debug2 "Request Header " "$entry"
hdr_indx=$(( hdr_indx + 1 )) hdr_indx=$((hdr_indx + 1))
done done
# clear headers from previous request to avoid getting wrong http code on timeouts # clear headers from previous request to avoid getting wrong http code on timeouts
@ -444,5 +447,3 @@ _edgedns_base64_sha256() {
# filepath=$1 # filepath=$1
# section=$2 # section=$2
#} #}