Skip to content
Permalink
Browse files

Merge pull request #2209 from Neilpang/dev

sync
  • Loading branch information...
Neilpang committed Apr 6, 2019
2 parents 54f1be6 + 0cfeee4 commit d01ab227b8f9b49ec08916d905ec3cb12c1e1b5a
Showing with 7 additions and 4 deletions.
  1. +4 −1 acme.sh
  2. +2 −2 deploy/gcore_cdn.sh
  3. +1 −1 dnsapi/dns_cf.sh
@@ -2004,7 +2004,10 @@ _read_conf() {
_r_c_f="$1"
_sdkey="$2"
if [ -f "$_r_c_f" ]; then
_sdv="$(grep "^$_sdkey *=" "$_r_c_f" | cut -d = -f 2-1000 | tr -d "'")"
_sdv="$(
eval "$(grep "^$_sdkey *=" "$_r_c_f")"
eval "printf \"%s\" \"\$$_sdkey\""
)"
if _startswith "$_sdv" "${B64CONF_START}" && _endswith "$_sdv" "${B64CONF_END}"; then
_sdv="$(echo "$_sdv" | sed "s/${B64CONF_START}//" | sed "s/${B64CONF_END}//" | _dbase64)"
fi
@@ -74,9 +74,9 @@ gcore_cdn_deploy() {
_response=$(_get "https://api.gcdn.co/resources")
_debug _response "$_response"
_regex=".*(\"id\".*?\"cname\":\"$_cdomain\".*?})"
_regex="\"cname\":\"$_cdomain\""
_regex="^.*\"cname\":\"$_cdomain\".*$"
_debug _regex "$_regex"
_resource=$(echo "$_response" | sed 's/},{/},\n{/g' | grep -E "$_regex")
_resource=$(echo "$_response" | sed 's/},{/},\n{/g' | _egrep_o "$_regex")
_debug _resource "$_resource"
_regex=".*\"id\":\([0-9]*\),.*$"
_debug _regex "$_regex"
@@ -147,7 +147,7 @@ dns_cf_rm() {
# _domain_id=sdjkglgdfewsdfg
_get_root() {
domain=$1
i=2
i=1
p=1
while true; do
h=$(printf "%s" "$domain" | cut -d . -f $i-100)

0 comments on commit d01ab22

Please sign in to comment.
You can’t perform that action at this time.