diff --git a/acme-downloader.sh b/acme-downloader.sh index 38190ab88d0b3c6630c416760387dbfc9ff12fde..575c3c93ad1c4196a3c06853351cdd8aa701ad41 100755 --- a/acme-downloader.sh +++ b/acme-downloader.sh @@ -166,7 +166,7 @@ done TYPE=$(echo $TYPE | tr '[:lower:]' '[:upper:]') -check_version $0 +#check_version $0 if [[ -n $UPDATE ]]; then curl $SCRIPT_URL -o $0 @@ -191,9 +191,9 @@ if [[ $TYPE != "EV" ]] && [[ $TYPE != "OV" ]]; then usage fi if [[ -z $WILDCARD ]]; then - $MODIFIED_CERT_NAME = "wildcard_${CERT_NAME}" + MODIFIED_CERT_NAME=$CERT_NAME else - $MODIFIED_CERT_NAME = $CERT_NAME + MODIFIED_CERT_NAME="wildcard_${CERT_NAME}" fi [[ -z $DAYS ]] && DAYS=30 [[ -z $CERT_DESTINATION ]] && CERT_DESTINATION="${CERT_BASE}/${MODIFIED_CERT_NAME}.crt" @@ -206,6 +206,7 @@ MINUTES=$((${DAYS} * 86400)) # give up if the certificate expiration is still within a proper range if openssl x509 -checkend $MINUTES -noout -in $FULLCHAIN_DESTINATION &>/dev/null; then + echo "the certificate $FULLCHAIN_DESTINATION is still valid" rm -f $TMP_CERT $TMP_FULLCHAIN $TMP_CA $TMP_KEY exit 0 fi