ervin/acme.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix install online

Browse Source
This commit is contained in:
neilpang 2021-01-26 19:44:26 +08:00 committed by neil
parent 77e8008752
commit 886776f6c9
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
acme.sh
View File

@ -6562,18 +6562,29 @@ Parameters:
" "
} }
# nocron noprofile # nocron noprofile branch
_installOnline() { installOnline() {
_info "Installing from online archive." _info "Installing from online archive."
_nocron="$1" _nocron="$1"
_noprofile="$2" if [ "$_nocron" ]; then
if [ ! "$BRANCH" ]; then _nocron="--no-cron"
BRANCH="master"
fi fi
shift
_noprofile="$1"
if [ "$_noprofile" ]; then
_noprofile="--no-profile"
fi
shift
target="$PROJECT/archive/$BRANCH.tar.gz" _branch="$3"
if [ ! "$_branch" ]; then
_branch="master"
fi
shift
target="$PROJECT/archive/$_branch.tar.gz"
_info "Downloading $target" _info "Downloading $target"
localname="$BRANCH.tar.gz" localname="$_branch.tar.gz"
if ! _get "$target" >$localname; then if ! _get "$target" >$localname; then
_err "Download error." _err "Download error."
return 1 return 1
@ -6585,9 +6596,9 @@ _installOnline() {
exit 1 exit 1
fi fi
cd "$PROJECT_NAME-$BRANCH" cd "$PROJECT_NAME-$_branch"
chmod +x $PROJECT_ENTRY chmod +x $PROJECT_ENTRY
if ./$PROJECT_ENTRY install "$_nocron" "" "$_noprofile"; then if ./$PROJECT_ENTRY --install $_nocron $_noprofile $@; then
_info "Install success!" _info "Install success!"
_initpath _initpath
_saveaccountconf "UPGRADE_HASH" "$(_getUpgradeHash)" _saveaccountconf "UPGRADE_HASH" "$(_getUpgradeHash)"
@ -6595,7 +6606,7 @@ _installOnline() {
cd .. cd ..
rm -rf "$PROJECT_NAME-$BRANCH" rm -rf "$PROJECT_NAME-$_branch"
rm -f "$localname" rm -f "$localname"
) )
} }
@ -6623,7 +6634,7 @@ upgrade() {
[ -z "$FORCE" ] && [ "$(_getUpgradeHash)" = "$(_readaccountconf "UPGRADE_HASH")" ] && _info "Already uptodate!" && exit 0 [ -z "$FORCE" ] && [ "$(_getUpgradeHash)" = "$(_readaccountconf "UPGRADE_HASH")" ] && _info "Already uptodate!" && exit 0
export LE_WORKING_DIR export LE_WORKING_DIR
cd "$LE_WORKING_DIR" cd "$LE_WORKING_DIR"
_installOnline "nocron" "noprofile" installOnline "nocron" "noprofile"
); then ); then
_info "Upgrade success!" _info "Upgrade success!"
exit 0 exit 0
@ -7458,11 +7469,6 @@ _process() {
} }
if [ "$INSTALLONLINE" ]; then
INSTALLONLINE=""
_installOnline
exit
fi
main() { main() {
[ -z "$1" ] && showhelp && return [ -z "$1" ] && showhelp && return