mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-11-01 03:51:46 +00:00
add support for upgrade from tag
This commit is contained in:
parent
1e34ccbe2e
commit
cb7e38577d
18
acme.sh
18
acme.sh
@ -6317,7 +6317,7 @@ _installOnline() {
|
|||||||
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" "$(_getMasterHash)"
|
_saveaccountconf "UPGRADE_HASH" "$(_getUpgradeHash)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
@ -6327,19 +6327,27 @@ _installOnline() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
_getMasterHash() {
|
_getRepoHash() {
|
||||||
|
_hash_path=$1
|
||||||
|
shift
|
||||||
|
_hash_url="https://api.github.com/repos/acmesh-official/$PROJECT_NAME/git/refs/$_hash_path"
|
||||||
|
_get $_hash_url | tr -d "\r\n" | tr '{},' '\n' | grep '"sha":' | cut -d '"' -f 4
|
||||||
|
}
|
||||||
|
|
||||||
|
_getUpgradeHash() {
|
||||||
_b="$BRANCH"
|
_b="$BRANCH"
|
||||||
if [ -z "$_b" ]; then
|
if [ -z "$_b" ]; then
|
||||||
_b="master"
|
_b="master"
|
||||||
fi
|
fi
|
||||||
_hash_url="https://api.github.com/repos/acmesh-official/$PROJECT_NAME/git/refs/heads/$_b"
|
_hash=$(_getRepoHash "heads/$_b")
|
||||||
_get $_hash_url | tr -d "\r\n" | tr '{},' '\n' | grep '"sha":' | cut -d '"' -f 4
|
if [ -z "$_hash" ]; then _hash=$(_getRepoHash "tags/$_b"); fi
|
||||||
|
echo $_hash
|
||||||
}
|
}
|
||||||
|
|
||||||
upgrade() {
|
upgrade() {
|
||||||
if (
|
if (
|
||||||
_initpath
|
_initpath
|
||||||
[ -z "$FORCE" ] && [ "$(_getMasterHash)" = "$(_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"
|
||||||
|
Loading…
Reference in New Issue
Block a user