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

minor

Browse Source
This commit is contained in:
neil 2016-09-22 21:38:11 +08:00
parent cfdaff5a46
commit 7da50703fb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
acme.sh
View File

@ -1248,6 +1248,10 @@ _starttlsserver() {
_readlink() { _readlink() {
_rf="$1" _rf="$1"
if ! readlink -f "$_rf" 2>/dev/null; then if ! readlink -f "$_rf" 2>/dev/null; then
if _startswith "$_rf" "\./$PROJECT_ENTRY" ; then
printf -- "%s" "$(pwd)/$PROJECT_ENTRY"
return 0
fi
readlink "$_rf" readlink "$_rf"
fi fi
} }
@ -1272,7 +1276,7 @@ __initHome() {
if [ -z "$LE_WORKING_DIR" ] ; then if [ -z "$LE_WORKING_DIR" ] ; then
if [ -f "$DEFAULT_INSTALL_HOME/account.conf" ] ; then if [ -f "$DEFAULT_INSTALL_HOME/account.conf" ] ; then
_debug "It seems tha $PROJECT_NAME is already installed in $DEFAULT_INSTALL_HOME" _debug "It seems that $PROJECT_NAME is already installed in $DEFAULT_INSTALL_HOME"
LE_WORKING_DIR="$DEFAULT_INSTALL_HOME" LE_WORKING_DIR="$DEFAULT_INSTALL_HOME"
else else
LE_WORKING_DIR="$_SCRIPT_HOME" LE_WORKING_DIR="$_SCRIPT_HOME"
@ -1283,6 +1287,7 @@ __initHome() {
_debug "Using default home:$DEFAULT_INSTALL_HOME" _debug "Using default home:$DEFAULT_INSTALL_HOME"
LE_WORKING_DIR="$DEFAULT_INSTALL_HOME" LE_WORKING_DIR="$DEFAULT_INSTALL_HOME"
fi fi
export LE_WORKING_DIR
_DEFAULT_ACCOUNT_CONF_PATH="$LE_WORKING_DIR/account.conf" _DEFAULT_ACCOUNT_CONF_PATH="$LE_WORKING_DIR/account.conf"