From 7da50703fbd3b1159c1840ae59fb367b6d059d40 Mon Sep 17 00:00:00 2001 From: neil Date: Thu, 22 Sep 2016 21:38:11 +0800 Subject: [PATCH] minor --- acme.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/acme.sh b/acme.sh index 91557b8d..c18a7c35 100755 --- a/acme.sh +++ b/acme.sh @@ -1248,6 +1248,10 @@ _starttlsserver() { _readlink() { _rf="$1" if ! readlink -f "$_rf" 2>/dev/null; then + if _startswith "$_rf" "\./$PROJECT_ENTRY" ; then + printf -- "%s" "$(pwd)/$PROJECT_ENTRY" + return 0 + fi readlink "$_rf" fi } @@ -1272,7 +1276,7 @@ __initHome() { if [ -z "$LE_WORKING_DIR" ] ; 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" else LE_WORKING_DIR="$_SCRIPT_HOME" @@ -1283,6 +1287,7 @@ __initHome() { _debug "Using default home:$DEFAULT_INSTALL_HOME" LE_WORKING_DIR="$DEFAULT_INSTALL_HOME" fi + export LE_WORKING_DIR _DEFAULT_ACCOUNT_CONF_PATH="$LE_WORKING_DIR/account.conf"