From eccec5f6d5bd7dde81a21cee3a7bf23a573d8822 Mon Sep 17 00:00:00 2001 From: neil Date: Sat, 16 Apr 2016 22:19:29 +0800 Subject: [PATCH] fix compatible for sh. '-' is not allowed in function name. --- acme.sh | 17 ++++++++++++++--- dnsapi/dns-cf.sh | 2 +- dnsapi/dns-cx.sh | 2 +- dnsapi/dns-dp.sh | 2 +- dnsapi/dns-myapi.sh | 6 +++--- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/acme.sh b/acme.sh index 72a297a8..67910b64 100755 --- a/acme.sh +++ b/acme.sh @@ -956,8 +956,19 @@ issue() { Le_ReloadCmd="$8" Le_RealFullChainPath="$9" - _initpath $Le_Domain + #remove these later. + if [[ "$Le_Webroot" == "dns-cf" ]] ; then + Le_Webroot="dns_cf" + fi + if [[ "$Le_Webroot" == "dns-dp" ]] ; then + Le_Webroot="dns_dp" + fi + if [[ "$Le_Webroot" == "dns-cx" ]] ; then + Le_Webroot="dns_cx" + fi + _initpath $Le_Domain + if [[ -f "$DOMAIN_CONF" ]] ; then Le_NextRenewTime=$(grep "^Le_NextRenewTime=" "$DOMAIN_CONF" | cut -d '=' -f 2) if [[ -z "$FORCE" ]] && [[ "$Le_NextRenewTime" ]] && [[ "$(date -u "+%s" )" -lt "$Le_NextRenewTime" ]] ; then @@ -1189,7 +1200,7 @@ issue() { return 1 fi - addcommand="$_currentRoot-add" + addcommand="$_currentRoot_add" if ! _exists $addcommand ; then _err "It seems that your api file is not correct, it must have a function named: $addcommand" return 1 @@ -1924,7 +1935,7 @@ Parameters: --webroot, -w /path/to/webroot Specifies the web root folder for web root mode. --standalone Use standalone mode. --apache Use apache mode. - --dns [dns-cf|dns-dp|dns-cx|/path/to/api/file] Use dns mode or dns api. + --dns [dns_cf|dns_dp|dns_cx|/path/to/api/file] Use dns mode or dns api. --keylength, -k [2048] Specifies the domain key length: 2048, 3072, 4096, 8192 or ec-256, ec-384. --accountkeylength, -ak [2048] Specifies the account key length. diff --git a/dnsapi/dns-cf.sh b/dnsapi/dns-cf.sh index b2d67c7a..69216e50 100755 --- a/dnsapi/dns-cf.sh +++ b/dnsapi/dns-cf.sh @@ -12,7 +12,7 @@ CF_Api="https://api.cloudflare.com/client/v4/" ######## Public functions ##################### #Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" -dns-cf-add(){ +dns_cf_add(){ fulldomain=$1 txtvalue=$2 diff --git a/dnsapi/dns-cx.sh b/dnsapi/dns-cx.sh index 2a455a32..130eecf9 100644 --- a/dnsapi/dns-cx.sh +++ b/dnsapi/dns-cx.sh @@ -14,7 +14,7 @@ CX_Api="https://www.cloudxns.net/api2" ######## Public functions ##################### #Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" -dns-cx-add() { +dns_cx_add() { fulldomain=$1 txtvalue=$2 diff --git a/dnsapi/dns-dp.sh b/dnsapi/dns-dp.sh index f58b9d3a..8a7b3362 100644 --- a/dnsapi/dns-dp.sh +++ b/dnsapi/dns-dp.sh @@ -14,7 +14,7 @@ DP_Api="https://dnsapi.cn" ######## Public functions ##################### #Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" -dns-dp-add() { +dns_dp_add() { fulldomain=$1 txtvalue=$2 diff --git a/dnsapi/dns-myapi.sh b/dnsapi/dns-myapi.sh index 4236e41c..cc26ab35 100644 --- a/dnsapi/dns-myapi.sh +++ b/dnsapi/dns-myapi.sh @@ -1,8 +1,8 @@ #!/bin/bash #Here is a sample custom api script. -#This file name is "dns-myapi.sh" -#So, here must be a method dns-myapi-add() +#This file name is "dns_myapi.sh" +#So, here must be a method dns_myapi-add() #Which will be called by acme.sh to add the txt record to your api system. #returns 0 meanst success, otherwise error. @@ -11,7 +11,7 @@ ######## Public functions ##################### #Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" -dns-myapi-add() { +dns_myapi_add() { fulldomain=$1 txtvalue=$2 _err "Not implemented!"