Browse Source

fix error message.

neil 9 years ago
parent
commit
01f54558b9
4 changed files with 10 additions and 5 deletions
  1. 7 2
      acme.sh
  2. 1 1
      dnsapi/dns_cf.sh
  3. 1 1
      dnsapi/dns_cx.sh
  4. 1 1
      dnsapi/dns_dp.sh

+ 7 - 2
acme.sh

@@ -1473,11 +1473,16 @@ issue() {
   _savedomainconf  "Le_NextRenewTimeStr"  "$Le_NextRenewTimeStr"
 
 
-  installcert $Le_Domain  "$Le_RealCertPath" "$Le_RealKeyPath" "$Le_RealCACertPath" "$Le_ReloadCmd" "$Le_RealFullChainPath"
-  if [ "$?" = "9" ] ; then
+  _output="$(installcert $Le_Domain  "$Le_RealCertPath" "$Le_RealKeyPath" "$Le_RealCACertPath" "$Le_ReloadCmd" "$Le_RealFullChainPath" 2>&1)"
+  _ret="$?"
+  if [ "$_ret" = "9" ] ; then
     #ignore the empty install error.
     return 0
   fi
+  if [ "$_ret" != "0" ] ; then
+    _err "$_output"
+    return 1
+  fi
 }
 
 renew() {

+ 1 - 1
dnsapi/dns_cf.sh

@@ -102,7 +102,7 @@ _get_root() {
       return 1
     fi
     
-    if printf $response | grep \"name\":\"$h\" ; then
+    if printf $response | grep \"name\":\"$h\" >/dev/null ; then
       _domain_id=$(printf "$response" | grep -o \"id\":\"[^\"]*\" | head -1 | cut -d : -f 2 | tr -d \")
       if [ "$_domain_id" ] ; then
         _sub_domain=$(printf $domain | cut -d . -f 1-$p)

+ 1 - 1
dnsapi/dns_cx.sh

@@ -144,7 +144,7 @@ _get_root() {
       return 1;
     fi
 
-    if printf "$response" | grep "$h." ; then
+    if printf "$response" | grep "$h." >/dev/null ; then
       seg=$(printf "$response" | grep -o "{[^{]*$h\.[^}]*\}" )
       _debug seg "$seg"
       _domain_id=$(printf "$seg" | grep -o \"id\":\"[^\"]*\" | cut -d : -f 2 | tr -d \")

+ 1 - 1
dnsapi/dns_dp.sh

@@ -152,7 +152,7 @@ _get_root() {
       return 1
     fi
     
-    if printf "$response" | grep "Action completed successful" ; then
+    if printf "$response" | grep "Action completed successful" >/dev/null ; then
       _domain_id=$(printf "$response" | grep -o \"id\":\"[^\"]*\" | cut -d : -f 2 | tr -d \")
       _debug _domain_id "$_domain_id"
       if [ "$_domain_id" ] ; then