Issue #2850 : grammar corrections for "exists" and "exist".
This commit is contained in:
parent
71a5f0e84e
commit
eca57beec1
10
acme.sh
10
acme.sh
@ -188,28 +188,28 @@ _dlg_versions() {
|
|||||||
if _exists "${ACME_OPENSSL_BIN:-openssl}"; then
|
if _exists "${ACME_OPENSSL_BIN:-openssl}"; then
|
||||||
${ACME_OPENSSL_BIN:-openssl} version 2>&1
|
${ACME_OPENSSL_BIN:-openssl} version 2>&1
|
||||||
else
|
else
|
||||||
echo "$ACME_OPENSSL_BIN doesn't exists."
|
echo "$ACME_OPENSSL_BIN doesn't exist."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "apache:"
|
echo "apache:"
|
||||||
if [ "$_APACHECTL" ] && _exists "$_APACHECTL"; then
|
if [ "$_APACHECTL" ] && _exists "$_APACHECTL"; then
|
||||||
$_APACHECTL -V 2>&1
|
$_APACHECTL -V 2>&1
|
||||||
else
|
else
|
||||||
echo "apache doesn't exists."
|
echo "apache doesn't exist."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "nginx:"
|
echo "nginx:"
|
||||||
if _exists "nginx"; then
|
if _exists "nginx"; then
|
||||||
nginx -V 2>&1
|
nginx -V 2>&1
|
||||||
else
|
else
|
||||||
echo "nginx doesn't exists."
|
echo "nginx doesn't exist."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "socat:"
|
echo "socat:"
|
||||||
if _exists "socat"; then
|
if _exists "socat"; then
|
||||||
socat -V 2>&1
|
socat -V 2>&1
|
||||||
else
|
else
|
||||||
_debug "socat doesn't exists."
|
_debug "socat doesn't exist."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -5519,7 +5519,7 @@ revoke() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
_info "Domain key file doesn't exists."
|
_info "Domain key file doesn't exist."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_info "Try account key."
|
_info "Try account key."
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
# If certificate already exist it will update only cert and key not touching other parameter
|
# If certificate already exists it will update only cert and key, not touching other parameters
|
||||||
# If certificate doesn't exist it will only upload cert and key and not set other parameter
|
# If certificate doesn't exist it will only upload cert and key, and not set other parameters
|
||||||
# Note that we deploy full chain
|
# Note that we deploy full chain
|
||||||
# Written by Geoffroi Genot <ggenot@voxbone.com>
|
# Written by Geoffroi Genot <ggenot@voxbone.com>
|
||||||
|
|
||||||
|
@ -181,6 +181,7 @@ _describe_records_query() {
|
|||||||
|
|
||||||
_clean() {
|
_clean() {
|
||||||
_check_exist_query "$_domain" "$_sub_domain"
|
_check_exist_query "$_domain" "$_sub_domain"
|
||||||
|
# do not correct grammar here
|
||||||
if ! _ali_rest "Check exist records" "ignore"; then
|
if ! _ali_rest "Check exist records" "ignore"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
@ -22,7 +22,7 @@ dns_dgon_add() {
|
|||||||
txtvalue=$2
|
txtvalue=$2
|
||||||
|
|
||||||
DO_API_KEY="${DO_API_KEY:-$(_readaccountconf_mutable DO_API_KEY)}"
|
DO_API_KEY="${DO_API_KEY:-$(_readaccountconf_mutable DO_API_KEY)}"
|
||||||
# Check if API Key Exist
|
# Check if API Key Exists
|
||||||
if [ -z "$DO_API_KEY" ]; then
|
if [ -z "$DO_API_KEY" ]; then
|
||||||
DO_API_KEY=""
|
DO_API_KEY=""
|
||||||
_err "You did not specify DigitalOcean API key."
|
_err "You did not specify DigitalOcean API key."
|
||||||
@ -77,7 +77,7 @@ dns_dgon_rm() {
|
|||||||
txtvalue=$2
|
txtvalue=$2
|
||||||
|
|
||||||
DO_API_KEY="${DO_API_KEY:-$(_readaccountconf_mutable DO_API_KEY)}"
|
DO_API_KEY="${DO_API_KEY:-$(_readaccountconf_mutable DO_API_KEY)}"
|
||||||
# Check if API Key Exist
|
# Check if API Key Exists
|
||||||
if [ -z "$DO_API_KEY" ]; then
|
if [ -z "$DO_API_KEY" ]; then
|
||||||
DO_API_KEY=""
|
DO_API_KEY=""
|
||||||
_err "You did not specify DigitalOcean API key."
|
_err "You did not specify DigitalOcean API key."
|
||||||
|
@ -18,7 +18,7 @@ dns_dynv6_add() {
|
|||||||
if ! _contains "$_your_hosts" "$_host"; then
|
if ! _contains "$_your_hosts" "$_host"; then
|
||||||
_debug "The host is $_host and the record $_record"
|
_debug "The host is $_host and the record $_record"
|
||||||
_debug "Dynv6 returned $_your_hosts"
|
_debug "Dynv6 returned $_your_hosts"
|
||||||
_err "The host $_host does not exists on your dynv6 account"
|
_err "The host $_host does not exist on your dynv6 account"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
_debug "found host on your account"
|
_debug "found host on your account"
|
||||||
@ -49,7 +49,7 @@ dns_dynv6_rm() {
|
|||||||
if ! _contains "$_your_hosts" "$_host"; then
|
if ! _contains "$_your_hosts" "$_host"; then
|
||||||
_debug "The host is $_host and the record $_record"
|
_debug "The host is $_host and the record $_record"
|
||||||
_debug "Dynv6 returned $_your_hosts"
|
_debug "Dynv6 returned $_your_hosts"
|
||||||
_err "The host $_host does not exists on your dynv6 account"
|
_err "The host $_host does not exist on your dynv6 account"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
_debug "found host on your account"
|
_debug "found host on your account"
|
||||||
|
@ -91,7 +91,7 @@ dns_gd_rm() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if ! _contains "$response" "$txtvalue"; then
|
if ! _contains "$response" "$txtvalue"; then
|
||||||
_info "The record is not existing, skip"
|
_info "The record does not exist, skip"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -155,7 +155,7 @@ _get_root() {
|
|||||||
if [ "$HETZNER_Zone_ID" ]; then
|
if [ "$HETZNER_Zone_ID" ]; then
|
||||||
_debug "Found, using: $HETZNER_Zone_ID"
|
_debug "Found, using: $HETZNER_Zone_ID"
|
||||||
if ! _hetzner_rest GET "zones/${HETZNER_Zone_ID}"; then
|
if ! _hetzner_rest GET "zones/${HETZNER_Zone_ID}"; then
|
||||||
_debug "Zone with id '$HETZNER_Zone_ID' not exists."
|
_debug "Zone with id '$HETZNER_Zone_ID' does not exist."
|
||||||
_cleardomainconf "$domain_param_name"
|
_cleardomainconf "$domain_param_name"
|
||||||
unset HETZNER_Zone_ID
|
unset HETZNER_Zone_ID
|
||||||
else
|
else
|
||||||
|
@ -37,7 +37,7 @@ dns_kinghost_add() {
|
|||||||
_debug "Getting txt records"
|
_debug "Getting txt records"
|
||||||
_kinghost_rest GET "dns" "name=$fulldomain&content=$txtvalue"
|
_kinghost_rest GET "dns" "name=$fulldomain&content=$txtvalue"
|
||||||
|
|
||||||
#This API call returns "status":"ok" if dns record does not exists
|
#This API call returns "status":"ok" if dns record does not exist
|
||||||
#We are creating a new txt record here, so we expect the "ok" status
|
#We are creating a new txt record here, so we expect the "ok" status
|
||||||
if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
|
if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
|
||||||
_err "Error"
|
_err "Error"
|
||||||
|
Loading…
Reference in New Issue
Block a user