plantroon
/
acme.sh
mirror of https://github.com/plantroon/acme.sh.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix https://github.com/Neilpang/acme.sh/issues/1295

This commit is contained in:
neilpang 2018-02-21 10:05:27 +08:00
parent bae50da799
commit 86ef0a2609
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
acme.sh
View File

@ -5073,7 +5073,7 @@ _installalias() {
} }
# nocron confighome # nocron confighome noprofile
install() { install() {
if [ -z "$LE_WORKING_DIR" ]; then if [ -z "$LE_WORKING_DIR" ]; then
@ -5082,6 +5082,7 @@ install() {
_nocron="$1" _nocron="$1"
_c_home="$2" _c_home="$2"
_noprofile="$3"
if ! _initpath; then if ! _initpath; then
_err "Install failed." _err "Install failed."
return 1 return 1
@ -5147,7 +5148,7 @@ install() {
_info "Installed to $LE_WORKING_DIR/$PROJECT_ENTRY" _info "Installed to $LE_WORKING_DIR/$PROJECT_ENTRY"
if [ "$IN_CRON" != "1" ]; then if [ "$IN_CRON" != "1" ] && [ -z "$_noprofile" ]; then
_installalias "$_c_home" _installalias "$_c_home"
fi fi
@ -5373,10 +5374,11 @@ Parameters:
" "
} }
# nocron # nocron noprofile
_installOnline() { _installOnline() {
_info "Installing from online archive." _info "Installing from online archive."
_nocron="$1" _nocron="$1"
_noprofile="$2"
if [ ! "$BRANCH" ]; then if [ ! "$BRANCH" ]; then
BRANCH="master" BRANCH="master"
fi fi
@ -5397,7 +5399,7 @@ _installOnline() {
cd "$PROJECT_NAME-$BRANCH" cd "$PROJECT_NAME-$BRANCH"
chmod +x $PROJECT_ENTRY chmod +x $PROJECT_ENTRY
if ./$PROJECT_ENTRY install "$_nocron"; then if ./$PROJECT_ENTRY install "$_nocron" "" "$_noprofile"; then
_info "Install success!" _info "Install success!"
fi fi
@ -5413,7 +5415,7 @@ upgrade() {
_initpath _initpath
export LE_WORKING_DIR export LE_WORKING_DIR
cd "$LE_WORKING_DIR" cd "$LE_WORKING_DIR"
_installOnline "nocron" _installOnline "nocron" "noprofile"
); then ); then
_info "Upgrade success!" _info "Upgrade success!"
exit 0 exit 0