Browse Source

fix format

cron
neilpang 7 years ago
parent
commit
8c88757451
  1. 8
      dnsapi/dns_azure.sh
  2. 4
      dnsapi/dns_selectel.sh

8
dnsapi/dns_azure.sh

@ -111,7 +111,7 @@ dns_azure_rm() {
return 1 return 1
fi fi
if [ -z "$AZUREDNS_APPID" ];then
if [ -z "$AZUREDNS_APPID" ]; then
AZUREDNS_SUBSCRIPTIONID="" AZUREDNS_SUBSCRIPTIONID=""
AZUREDNS_TENANTID="" AZUREDNS_TENANTID=""
AZUREDNS_APPID="" AZUREDNS_APPID=""
@ -162,7 +162,7 @@ _azure_rest() {
export _H1="authorization: Bearer $accesstoken" export _H1="authorization: Bearer $accesstoken"
export _H2="accept: application/json" export _H2="accept: application/json"
export _H3="Content-Type: application/json" export _H3="Content-Type: application/json"
_debug "$ep" _debug "$ep"
if [ "$m" != "GET" ]; then if [ "$m" != "GET" ]; then
_debug data "$data" _debug data "$data"
@ -173,7 +173,7 @@ _azure_rest() {
_debug2 response "$response" _debug2 response "$response"
_code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\r\n")" _code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\r\n")"
_debug2 "http response code $_code"
_debug2 "http response code $_code"
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
_err "error $ep" _err "error $ep"
@ -197,7 +197,7 @@ _azure_getaccess_token() {
accesstoken=$(echo "$response" | _egrep_o "\"access_token\":\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d \") accesstoken=$(echo "$response" | _egrep_o "\"access_token\":\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d \")
_debug2 "response $response" _debug2 "response $response"
if [ -z "$accesstoken" ]; then
if [ -z "$accesstoken" ]; then
_err "no acccess token received" _err "no acccess token received"
return 1 return 1
fi fi

4
dnsapi/dns_selectel.sh

@ -83,7 +83,7 @@ dns_selectel_rm() {
return 1 return 1
fi fi
_record_id="$(echo "$_record_seg" | tr ",}" "\n\n" | tr -d " " | grep "\"id\"" | cut -d : -f 2)"
_record_id="$(echo "$_record_seg" | tr "," "\n" | tr "}" "\n" | tr -d " " | grep "\"id\"" | cut -d : -f 2)"
_debug2 "_record_id" "$_record_id" _debug2 "_record_id" "$_record_id"
if [ -z "$_record_id" ]; then if [ -z "$_record_id" ]; then
_err "can not find _record_id" _err "can not find _record_id"
@ -127,7 +127,7 @@ _get_root() {
if ! _sl_rest GET "/$h"; then if ! _sl_rest GET "/$h"; then
return 1 return 1
fi fi
_domain_id="$(echo "$response" | tr ",}" "\n\n" | tr -d " " | grep "\"id\":" | cut -d : -f 2)"
_domain_id="$(echo "$response" | tr "," "\n" | tr "}" "\n" | tr -d " " | grep "\"id\":" | cut -d : -f 2)"
return 0 return 0
fi fi
p=$i p=$i

Loading…
Cancel
Save