Merge pull request #402 from Neilpang/dev

Dev
This commit is contained in:
neil 2016-11-18 20:04:48 +08:00 committed by GitHub
commit 05d7ae4efa
2 changed files with 14 additions and 9 deletions

17
acme.sh
View File

@ -1705,8 +1705,6 @@ _initpath() {
return 0 return 0
fi fi
mkdir -p "$CA_DIR"
domain="$1" domain="$1"
_ilength="$2" _ilength="$2"
@ -1726,13 +1724,6 @@ _initpath() {
_debug DOMAIN_PATH "$DOMAIN_PATH" _debug DOMAIN_PATH "$DOMAIN_PATH"
fi fi
if [ ! -d "$DOMAIN_PATH" ]; then
if ! mkdir -p "$DOMAIN_PATH"; then
_err "Can not create domain path: $DOMAIN_PATH"
return 1
fi
fi
if [ -z "$DOMAIN_CONF" ]; then if [ -z "$DOMAIN_CONF" ]; then
DOMAIN_CONF="$DOMAIN_PATH/$domain.conf" DOMAIN_CONF="$DOMAIN_PATH/$domain.conf"
fi fi
@ -3005,6 +2996,10 @@ renewAll() {
for di in "${CERT_HOME}"/*.*/; do for di in "${CERT_HOME}"/*.*/; do
_debug di "$di" _debug di "$di"
if ! [ -d "$di" ]; then
_debug "Not directory, skip: $di"
continue
fi
d=$(basename "$di") d=$(basename "$di")
_debug d "$d" _debug d "$d"
( (
@ -3127,6 +3122,10 @@ list() {
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 di in "${CERT_HOME}"/*.*/; do for di in "${CERT_HOME}"/*.*/; do
if ! [ -d "$di" ]; then
_debug "Not directory, skip: $di"
continue
fi
d=$(basename "$di") d=$(basename "$di")
_debug d "$d" _debug d "$d"
( (

View File

@ -22,6 +22,12 @@ dns_cf_add() {
return 1 return 1
fi fi
if ! _contains "$CF_Email" "@"; then
_err "It seems that the CF_Email=$CF_Email is not a valid email address."
_err "Please check and retry."
return 1
fi
#save the api key and email to the account conf file. #save the api key and email to the account conf file.
_saveaccountconf CF_Key "$CF_Key" _saveaccountconf CF_Key "$CF_Key"
_saveaccountconf CF_Email "$CF_Email" _saveaccountconf CF_Email "$CF_Email"