Browse Source

fix deactivate for solaris

fix deactivate for solaris
neil 8 years ago
parent
commit
b3f915b5b2
2 changed files with 2 additions and 1 deletions
  1. 1 1
      acme.sh
  2. 1 0
      dnsapi/dns_dp.sh

+ 1 - 1
acme.sh

@@ -3469,7 +3469,7 @@ _deactivate() {
       return 1
       return 1
     fi
     fi
 
 
-    entry="$(printf "%s\n" "$response" | _egrep_o '[^\{]*"status":"valid","uri"[^\}]*')"
+    entry="$(printf "%s\n" "$response" | _egrep_o '{"type":".*","status":"valid","uri"[^}]*')"
     _debug entry "$entry"
     _debug entry "$entry"
 
 
     if [ -z "$entry" ]; then
     if [ -z "$entry" ]; then

+ 1 - 0
dnsapi/dns_dp.sh

@@ -104,6 +104,7 @@ existing_records() {
   if _contains "$response" "Action completed successful"; then
   if _contains "$response" "Action completed successful"; then
     count=$(printf "%s" "$response" | grep '<type>TXT</type>' | wc -l | tr -d ' ')
     count=$(printf "%s" "$response" | grep '<type>TXT</type>' | wc -l | tr -d ' ')
     record_id=$(printf "%s" "$response" | grep '^<id>' | tail -1 | cut -d '>' -f 2 | cut -d '<' -f 1)
     record_id=$(printf "%s" "$response" | grep '^<id>' | tail -1 | cut -d '>' -f 2 | cut -d '<' -f 1)
+    _debug record_id "$record_id"
     return 0
     return 0
   else
   else
     _err "get existing records error."
     _err "get existing records error."