Merge pull request #2239 from Neilpang/dev

sync
This commit is contained in:
neil 2019-04-29 21:46:10 +08:00 committed by GitHub
commit 6489cfbce6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1032,7 +1032,7 @@ _createkey() {
_is_idn() { _is_idn() {
_is_idn_d="$1" _is_idn_d="$1"
_debug2 _is_idn_d "$_is_idn_d" _debug2 _is_idn_d "$_is_idn_d"
_idn_temp=$(printf "%s" "$_is_idn_d" | tr -d '0-9' | tr -d 'a-z' | tr -d 'A-Z' | tr -d '*.,-') _idn_temp=$(printf "%s" "$_is_idn_d" | tr -d '0-9' | tr -d 'a-z' | tr -d 'A-Z' | tr -d '*.,-_')
_debug2 _idn_temp "$_idn_temp" _debug2 _idn_temp "$_idn_temp"
[ "$_idn_temp" ] [ "$_idn_temp" ]
} }
@ -1364,7 +1364,7 @@ createDomainKey() {
_info "The domain key is here: $(__green $CERT_KEY_PATH)" _info "The domain key is here: $(__green $CERT_KEY_PATH)"
return 0 return 0
else else
_err "Can not domain key" _err "Can not create domain key"
return 1 return 1
fi fi
else else