From aec6636205d539eae83f54b4fa4f868f5079d55b Mon Sep 17 00:00:00 2001
From: neilpang <neil@neilpang.com>
Date: Sun, 2 Jun 2019 19:36:11 +0800
Subject: [PATCH] add _getdeployconf

---
 acme.sh          | 17 +++++++++++++++++
 deploy/docker.sh | 24 ++++++++++++------------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/acme.sh b/acme.sh
index eb2194aa..45f0ea86 100755
--- a/acme.sh
+++ b/acme.sh
@@ -2078,6 +2078,23 @@ _readdomainconf() {
   _read_conf "$DOMAIN_CONF" "$1"
 }
 
+#key  value  base64encode
+_savedeployconf() {
+  _savedomainconf "SAVED_$1" "$2" "$3"
+  #remove later
+  _clearaccountconf "$1"
+}
+
+#key
+_getdeployconf() {
+  _rac_key="$1"
+  if [ "$(eval echo \$"$_rac_key")" ]; then
+    return 0 # do nothing
+  fi
+  _saved=$(_readdomainconf "SAVED_$_rac_key")
+  eval "export $_rac_key=$_saved"
+}
+
 #_saveaccountconf  key  value  base64encode
 _saveaccountconf() {
   _save_conf "$ACCOUNT_CONF_PATH" "$@"
diff --git a/deploy/docker.sh b/deploy/docker.sh
index d2dc70bc..6f3a2718 100755
--- a/deploy/docker.sh
+++ b/deploy/docker.sh
@@ -19,13 +19,13 @@ docker_deploy() {
   _cca="$4"
   _cfullchain="$5"
   _debug _cdomain "$_cdomain"
-  DEPLOY_DOCKER_CONTAINER_LABEL="$(echo "$DEPLOY_DOCKER_CONTAINER_LABEL" | tr -d '"')"
+  _getdeployconf DEPLOY_DOCKER_CONTAINER_LABEL
   if [ -z "$DEPLOY_DOCKER_CONTAINER_LABEL" ]; then
     _err "The DEPLOY_DOCKER_CONTAINER_LABEL variable is not defined, we use this label to find the container."
     _err "See: $_DEPLOY_DOCKER_WIKI"
   fi
 
-  _savedomainconf DEPLOY_DOCKER_CONTAINER_LABEL "$DEPLOY_DOCKER_CONTAINER_LABEL"
+  _savedeployconf DEPLOY_DOCKER_CONTAINER_LABEL "$DEPLOY_DOCKER_CONTAINER_LABEL"
 
   if [ "$DOCKER_HOST" ]; then
     _saveaccountconf DOCKER_HOST "$DOCKER_HOST"
@@ -63,29 +63,29 @@ docker_deploy() {
     fi
   fi
 
-  DEPLOY_DOCKER_CONTAINER_KEY_FILE="$(echo "$DEPLOY_DOCKER_CONTAINER_KEY_FILE" | tr -d '"')"
+  _getdeployconf DEPLOY_DOCKER_CONTAINER_KEY_FILE
   if [ "$DEPLOY_DOCKER_CONTAINER_KEY_FILE" ]; then
-    _savedomainconf DEPLOY_DOCKER_CONTAINER_KEY_FILE "$DEPLOY_DOCKER_CONTAINER_KEY_FILE"
+    _savedeployconf DEPLOY_DOCKER_CONTAINER_KEY_FILE "$DEPLOY_DOCKER_CONTAINER_KEY_FILE"
   fi
 
-  DEPLOY_DOCKER_CONTAINER_CERT_FILE="$(echo "$DEPLOY_DOCKER_CONTAINER_CERT_FILE" | tr -d '"')"
+  _getdeployconf DEPLOY_DOCKER_CONTAINER_CERT_FILE
   if [ "$DEPLOY_DOCKER_CONTAINER_CERT_FILE" ]; then
-    _savedomainconf DEPLOY_DOCKER_CONTAINER_CERT_FILE "$DEPLOY_DOCKER_CONTAINER_CERT_FILE"
+    _savedeployconf DEPLOY_DOCKER_CONTAINER_CERT_FILE "$DEPLOY_DOCKER_CONTAINER_CERT_FILE"
   fi
 
-  DEPLOY_DOCKER_CONTAINER_CA_FILE="$(echo "$DEPLOY_DOCKER_CONTAINER_CA_FILE" | tr -d '"')"
+  _getdeployconf DEPLOY_DOCKER_CONTAINER_CA_FILE
   if [ "$DEPLOY_DOCKER_CONTAINER_CA_FILE" ]; then
-    _savedomainconf DEPLOY_DOCKER_CONTAINER_CA_FILE "$DEPLOY_DOCKER_CONTAINER_CA_FILE"
+    _savedeployconf DEPLOY_DOCKER_CONTAINER_CA_FILE "$DEPLOY_DOCKER_CONTAINER_CA_FILE"
   fi
 
-  DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE="$(echo "$DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE" | tr -d '"')"
+  _getdeployconf DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE
   if [ "$DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE" ]; then
-    _savedomainconf DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE "$DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE"
+    _savedeployconf DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE "$DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE"
   fi
 
-  DEPLOY_DOCKER_CONTAINER_RELOAD_CMD="$(echo "$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD" | tr -d '"')"
+  _getdeployconf DEPLOY_DOCKER_CONTAINER_RELOAD_CMD
   if [ "$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD" ]; then
-    _savedomainconf DEPLOY_DOCKER_CONTAINER_RELOAD_CMD "$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD"
+    _savedeployconf DEPLOY_DOCKER_CONTAINER_RELOAD_CMD "$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD"
   fi
 
   _cid="$(_get_id "$DEPLOY_DOCKER_CONTAINER_LABEL")"