mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-12-23 05:31:42 +00:00
fix shellcheck warnings
This commit is contained in:
parent
dec90f7e5e
commit
e591d5cfe4
50
acme.sh
50
acme.sh
@ -27,7 +27,7 @@ STAGE_CA="https://acme-staging.api.letsencrypt.org"
|
|||||||
VTYPE_HTTP="http-01"
|
VTYPE_HTTP="http-01"
|
||||||
VTYPE_DNS="dns-01"
|
VTYPE_DNS="dns-01"
|
||||||
VTYPE_TLS="tls-sni-01"
|
VTYPE_TLS="tls-sni-01"
|
||||||
VTYPE_TLS2="tls-sni-02"
|
#VTYPE_TLS2="tls-sni-02"
|
||||||
|
|
||||||
LOCAL_ANY_ADDRESS="0.0.0.0"
|
LOCAL_ANY_ADDRESS="0.0.0.0"
|
||||||
|
|
||||||
@ -247,10 +247,10 @@ _exists() {
|
|||||||
_usage "Usage: _exists cmd"
|
_usage "Usage: _exists cmd"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if type command >/dev/null 2>&1; then
|
if command >/dev/null 2>&1; then
|
||||||
command -v "$cmd" >/dev/null 2>&1
|
command -v "$cmd" >/dev/null 2>&1
|
||||||
else
|
else which >/dev/null 2>&1;
|
||||||
type "$cmd" >/dev/null 2>&1
|
which "$cmd" >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
ret="$?"
|
ret="$?"
|
||||||
_debug3 "$cmd exists=$ret"
|
_debug3 "$cmd exists=$ret"
|
||||||
@ -259,7 +259,7 @@ _exists() {
|
|||||||
|
|
||||||
#a + b
|
#a + b
|
||||||
_math() {
|
_math() {
|
||||||
expr "$@"
|
$(( "$@" ))
|
||||||
}
|
}
|
||||||
|
|
||||||
_h_char_2_dec() {
|
_h_char_2_dec() {
|
||||||
@ -299,10 +299,7 @@ _h2b() {
|
|||||||
hex=$(cat)
|
hex=$(cat)
|
||||||
i=1
|
i=1
|
||||||
j=2
|
j=2
|
||||||
if _exists let; then
|
|
||||||
uselet="1"
|
|
||||||
fi
|
|
||||||
_debug3 uselet "$uselet"
|
|
||||||
_debug3 _URGLY_PRINTF "$_URGLY_PRINTF"
|
_debug3 _URGLY_PRINTF "$_URGLY_PRINTF"
|
||||||
while true; do
|
while true; do
|
||||||
if [ -z "$_URGLY_PRINTF" ]; then
|
if [ -z "$_URGLY_PRINTF" ]; then
|
||||||
@ -310,7 +307,7 @@ _h2b() {
|
|||||||
if [ -z "$h" ]; then
|
if [ -z "$h" ]; then
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
printf "\x$h"
|
printf "\x$h%s"
|
||||||
else
|
else
|
||||||
ic="$(printf "%s" "$hex" | cut -c $i)"
|
ic="$(printf "%s" "$hex" | cut -c $i)"
|
||||||
jc="$(printf "%s" "$hex" | cut -c $j)"
|
jc="$(printf "%s" "$hex" | cut -c $j)"
|
||||||
@ -321,13 +318,10 @@ _h2b() {
|
|||||||
jc="$(_h_char_2_dec "$jc")"
|
jc="$(_h_char_2_dec "$jc")"
|
||||||
printf '\'"$(printf "%o" "$(_math "$ic" \* 16 + $jc)")"
|
printf '\'"$(printf "%o" "$(_math "$ic" \* 16 + $jc)")"
|
||||||
fi
|
fi
|
||||||
if [ "$uselet" ]; then
|
|
||||||
let "i+=2" >/dev/null
|
i="$(_math "$i" + 2)"
|
||||||
let "j+=2" >/dev/null
|
j="$(_math "$j" + 2)"
|
||||||
else
|
|
||||||
i="$(_math "$i" + 2)"
|
|
||||||
j="$(_math "$j" + 2)"
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3006,9 +3000,9 @@ renewAll() {
|
|||||||
_debug "_stopRenewOnError" "$_stopRenewOnError"
|
_debug "_stopRenewOnError" "$_stopRenewOnError"
|
||||||
_ret="0"
|
_ret="0"
|
||||||
|
|
||||||
for d in "${CERT_HOME}"/*.*/; do
|
for di in "${CERT_HOME}"/*.*/; do
|
||||||
_debug d "$d"
|
_debug di "$di"
|
||||||
d=$(basename "$d")
|
d=$(basename "$di")
|
||||||
_debug d "$d"
|
_debug d "$d"
|
||||||
(
|
(
|
||||||
if _endswith "$d" "$ECC_SUFFIX"; then
|
if _endswith "$d" "$ECC_SUFFIX"; then
|
||||||
@ -3129,15 +3123,15 @@ list() {
|
|||||||
_sep="|"
|
_sep="|"
|
||||||
if [ "$_raw" ]; then
|
if [ "$_raw" ]; then
|
||||||
printf "%s\n" "Main_Domain${_sep}KeyLength${_sep}SAN_Domains${_sep}Created${_sep}Renew"
|
printf "%s\n" "Main_Domain${_sep}KeyLength${_sep}SAN_Domains${_sep}Created${_sep}Renew"
|
||||||
for d in "${CERT_HOME}"/*.*/; do
|
for di in "${CERT_HOME}"/*.*/; do
|
||||||
d=$(basename "$d")
|
d=$(basename "$di")
|
||||||
_debug d "$d"
|
_debug d "$d"
|
||||||
(
|
(
|
||||||
if _endswith "$d" "$ECC_SUFFIX"; then
|
if _endswith "$d" "$ECC_SUFFIX"; then
|
||||||
_isEcc=$(echo "$d" | cut -d "$ECC_SEP" -f 2)
|
_isEcc=$(echo "$d" | cut -d "$ECC_SEP" -f 2)
|
||||||
d=$(echo "$d" | cut -d "$ECC_SEP" -f 1)
|
d=$(echo "$d" | cut -d "$ECC_SEP" -f 1)
|
||||||
fi
|
fi
|
||||||
_initpath $d "$_isEcc"
|
_initpath "$d" "$_isEcc"
|
||||||
if [ -f "$DOMAIN_CONF" ]; then
|
if [ -f "$DOMAIN_CONF" ]; then
|
||||||
. "$DOMAIN_CONF"
|
. "$DOMAIN_CONF"
|
||||||
printf "%s\n" "$Le_Domain${_sep}\"$Le_Keylength\"${_sep}$Le_Alt${_sep}$Le_CertCreateTimeStr${_sep}$Le_NextRenewTimeStr"
|
printf "%s\n" "$Le_Domain${_sep}\"$Le_Keylength\"${_sep}$Le_Alt${_sep}$Le_CertCreateTimeStr${_sep}$Le_NextRenewTimeStr"
|
||||||
@ -3163,13 +3157,13 @@ deploy() {
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_initpath $Le_Domain "$_isEcc"
|
_initpath "$Le_Domain" "$_isEcc"
|
||||||
if [ ! -d "$DOMAIN_PATH" ]; then
|
if [ ! -d "$DOMAIN_PATH" ]; then
|
||||||
_err "Domain is not valid:'$Le_Domain'"
|
_err "Domain is not valid:'$Le_Domain'"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_deployApi="$(_findHook $Le_Domain deploy $Le_DeployHook)"
|
_deployApi="$(_findHook "$Le_Domain" deploy "$Le_DeployHook")"
|
||||||
if [ -z "$_deployApi" ]; then
|
if [ -z "$_deployApi" ]; then
|
||||||
_err "The deploy hook $Le_DeployHook is not found."
|
_err "The deploy hook $Le_DeployHook is not found."
|
||||||
return 1
|
return 1
|
||||||
@ -3179,18 +3173,18 @@ deploy() {
|
|||||||
_savedomainconf Le_DeployHook "$Le_DeployHook"
|
_savedomainconf Le_DeployHook "$Le_DeployHook"
|
||||||
|
|
||||||
if ! (
|
if ! (
|
||||||
if ! . $_deployApi; then
|
if ! . "$_deployApi"; then
|
||||||
_err "Load file $_deployApi error. Please check your api file and try again."
|
_err "Load file $_deployApi error. Please check your api file and try again."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
d_command="${Le_DeployHook}_deploy"
|
d_command="${Le_DeployHook}_deploy"
|
||||||
if ! _exists $d_command; then
|
if ! _exists "$d_command"; then
|
||||||
_err "It seems that your api file is not correct, it must have a function named: $d_command"
|
_err "It seems that your api file is not correct, it must have a function named: $d_command"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! $d_command $Le_Domain "$CERT_KEY_PATH" "$CERT_PATH" "$CA_CERT_PATH" "$CERT_FULLCHAIN_PATH"; then
|
if ! $d_command "$Le_Domain" "$CERT_KEY_PATH" "$CERT_PATH" "$CA_CERT_PATH" "$CERT_FULLCHAIN_PATH"; then
|
||||||
_err "Error deploy for domain:$Le_Domain"
|
_err "Error deploy for domain:$Le_Domain"
|
||||||
_on_issue_err
|
_on_issue_err
|
||||||
return 1
|
return 1
|
||||||
|
Loading…
Reference in New Issue
Block a user