plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-22 21:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Save customized account.conf.

Browse Source
This commit is contained in:
neil 2016-04-11 22:33:57 +08:00
parent e8cce73a17
commit d53289d707
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
le.sh
View File

@ -662,8 +662,14 @@ _initpath() {
LE_WORKING_DIR=$HOME/.le LE_WORKING_DIR=$HOME/.le
fi fi
_DEFAULT_ACCOUNT_CONF_PATH="$LE_WORKING_DIR/account.conf"
if [[ -f "$_DEFAULT_ACCOUNT_CONF_PATH" ]] ; then
source "$_DEFAULT_ACCOUNT_CONF_PATH"
fi
if [[ -z "$ACCOUNT_CONF_PATH" ]] ; then if [[ -z "$ACCOUNT_CONF_PATH" ]] ; then
ACCOUNT_CONF_PATH="$LE_WORKING_DIR/account.conf" ACCOUNT_CONF_PATH="$_DEFAULT_ACCOUNT_CONF_PATH"
fi fi
if [[ -f "$ACCOUNT_CONF_PATH" ]] ; then if [[ -f "$ACCOUNT_CONF_PATH" ]] ; then
@ -1122,7 +1128,7 @@ issue() {
fi fi
addcommand="$_currentRoot-add" addcommand="$_currentRoot-add"
if ! command -v $addcommand ; then if ! _exists $addcommand ; then
_err "It seems that your api file is not correct, it must have a function named: $addcommand" _err "It seems that your api file is not correct, it must have a function named: $addcommand"
return 1 return 1
fi fi
@ -1605,8 +1611,11 @@ _detect_profile() {
_initconf() { _initconf() {
_initpath _initpath
if [[ ! -f "$ACCOUNT_CONF_PATH" ]] ; then if [[ ! -f "$ACCOUNT_CONF_PATH" ]] ; then
echo "#Account configurations: echo "#ACCOUNT_CONF_PATH=xxxx
#Account configurations:
#Here are the supported macros, uncomment them to make them take effect. #Here are the supported macros, uncomment them to make them take effect.
#ACCOUNT_EMAIL=aaa@aaa.com # the account email used to register account. #ACCOUNT_EMAIL=aaa@aaa.com # the account email used to register account.
#ACCOUNT_KEY_PATH=\"/path/to/account.key\" #ACCOUNT_KEY_PATH=\"/path/to/account.key\"
@ -1727,11 +1736,15 @@ alias le.sh=\"$LE_WORKING_DIR/le.sh\"
mv "$LE_WORKING_DIR/account.acc" "$LE_WORKING_DIR/account.key" mv "$LE_WORKING_DIR/account.acc" "$LE_WORKING_DIR/account.key"
fi fi
installcronjob
if [[ ! -f "$ACCOUNT_CONF_PATH" ]] ; then if [[ ! -f "$ACCOUNT_CONF_PATH" ]] ; then
_initconf _initconf
fi fi
_setopt "$_DEFAULT_ACCOUNT_CONF_PATH" "ACCOUNT_CONF_PATH" "=" "\"$ACCOUNT_CONF_PATH\""
_setopt "$ACCOUNT_CONF_PATH" "ACCOUNT_CONF_PATH" "=" "\"$ACCOUNT_CONF_PATH\""
installcronjob
_info OK _info OK
} }