From bc2642f6d4f467c7d515f2eea01df38a800213b7 Mon Sep 17 00:00:00 2001
From: neil <github@byneil.com>
Date: Tue, 16 Jul 2019 18:31:33 +0800
Subject: [PATCH] getdnsconf

---
 acme.sh          | 20 ++++++++++++++++++++
 dnsapi/dns_cf.sh | 13 +++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/acme.sh b/acme.sh
index d168b566..5e1d51a9 100755
--- a/acme.sh
+++ b/acme.sh
@@ -2100,6 +2100,26 @@ _getdeployconf() {
   eval "export $_rac_key=$_saved"
 }
 
+#key
+_getdnsapiconf() {
+  _rac_key="$1"
+  _rac_value="$(eval echo \$"$_rac_key")"
+  if [ "$_rac_value" ]; then
+    if _startswith "$_rac_value" '"' && _endswith "$_rac_value" '"'; then
+      _debug2 "trim quotation marks"
+      eval "export $_rac_key=$_rac_value"
+    fi
+    return 0 # do nothing
+  fi
+  _saved=$(_readaccountconf_mutable "$_rac_key")
+  eval "export $_rac_key=$_saved"
+}
+
+#key  value base64encode
+_savednsapiconf() {
+  _saveaccountconf_mutable "$@"
+}
+
 #_saveaccountconf  key  value  base64encode
 _saveaccountconf() {
   _save_conf "$ACCOUNT_CONF_PATH" "$@"
diff --git a/dnsapi/dns_cf.sh b/dnsapi/dns_cf.sh
index cd93189f..451124a3 100755
--- a/dnsapi/dns_cf.sh
+++ b/dnsapi/dns_cf.sh
@@ -14,8 +14,9 @@ dns_cf_add() {
   fulldomain=$1
   txtvalue=$2
 
-  CF_Key="${CF_Key:-$(_readaccountconf_mutable CF_Key)}"
-  CF_Email="${CF_Email:-$(_readaccountconf_mutable CF_Email)}"
+  _getdnsapiconf CF_Key
+  _getdnsapiconf CF_Email
+
   if [ -z "$CF_Key" ] || [ -z "$CF_Email" ]; then
     CF_Key=""
     CF_Email=""
@@ -31,8 +32,8 @@ dns_cf_add() {
   fi
 
   #save the api key and email to the account conf file.
-  _saveaccountconf_mutable CF_Key "$CF_Key"
-  _saveaccountconf_mutable CF_Email "$CF_Email"
+  _savednsapiconf CF_Key "$CF_Key"
+  _savednsapiconf CF_Email "$CF_Email"
 
   _debug "First detect the root zone"
   if ! _get_root "$fulldomain"; then
@@ -92,8 +93,8 @@ dns_cf_rm() {
   fulldomain=$1
   txtvalue=$2
 
-  CF_Key="${CF_Key:-$(_readaccountconf_mutable CF_Key)}"
-  CF_Email="${CF_Email:-$(_readaccountconf_mutable CF_Email)}"
+  _getdnsapiconf CF_Key
+  _getdnsapiconf CF_Email
   if [ -z "$CF_Key" ] || [ -z "$CF_Email" ]; then
     CF_Key=""
     CF_Email=""