mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #9195 from heitbaum/tools13
update_binary-addons: add -x option to skip no tag updates
This commit is contained in:
commit
58ae4a642d
@ -6,11 +6,13 @@
|
||||
|
||||
BUMP_PKG_REV=""
|
||||
KEEP_GIT_DIRS="yes"
|
||||
UPDATE_TO_HASH="yes"
|
||||
|
||||
usage() {
|
||||
echo "Usage: $0 [options] <kodi-branch> [<unofficial-addon-branch>]"
|
||||
echo " -b, --bump-pkg-rev: bump PKG_REV if package was not updated"
|
||||
echo " -d, --delete-git-dirs: delete cloned git dirs after update"
|
||||
echo " -x, --no-update-to-hash: do not update to hash if tag is not set"
|
||||
echo " -h, --help: display help and exit"
|
||||
exit 1
|
||||
}
|
||||
@ -25,6 +27,10 @@ while [ $# -ne 0 ]; do
|
||||
KEEP_GIT_DIRS=""
|
||||
shift
|
||||
;;
|
||||
-x | --no-update-to-hash)
|
||||
UPDATE_TO_HASH="no"
|
||||
shift
|
||||
;;
|
||||
-h | --help)
|
||||
usage
|
||||
exit 1
|
||||
@ -135,32 +141,39 @@ for addontxt in ${ADDONS_REPO_LOCATION}/*-addons.txt; do
|
||||
|
||||
if [ -z "${NEW_VERSION}" ]; then
|
||||
NO_TAG="yes"
|
||||
echo "========================================================================"
|
||||
msg_warn "WARNING: no tag found for addon ${ADDON}, falling back to HEAD"
|
||||
echo "========================================================================"
|
||||
if [ -z "${GITHUB_API_TOKEN}" ]; then
|
||||
PARAMS="resolve_hash_in_branch ${GIT_DIR} ${GIT_BRANCH}"
|
||||
else
|
||||
PARAMS="resolve_hash_on_gh ${GIT_REPO} ${GIT_BRANCH}"
|
||||
fi
|
||||
NEW_VERSION=$(${PARAMS})
|
||||
fi
|
||||
|
||||
echo "Resolved version for ${ADDON}: ${GIT_BRANCH} => ${NEW_VERSION}"
|
||||
|
||||
if update_pkg "${ADDON_PATH}" ${ADDON} ${NEW_VERSION}; then
|
||||
if [ -n "${NO_TAG}" ]; then
|
||||
# always bump PKG_REV on updates as we have no info if version changed
|
||||
bump_pkg_rev "${ADDON_PATH}" "${ADDON}"
|
||||
echo "========================================================================"
|
||||
if [ "${UPDATE_TO_HASH}" != "yes" ]; then
|
||||
msg_warn "WARNING: no tag found for addon ${ADDON}, and UPDATE_TO_HASH=no so not updating"
|
||||
NEW_VERSION=""
|
||||
else
|
||||
reset_pkg_rev "${ADDON_PATH}" "${ADDON}"
|
||||
msg_warn "WARNING: no tag found for addon ${ADDON}, falling back to HEAD"
|
||||
NEW_VERSION=$(${PARAMS})
|
||||
fi
|
||||
else
|
||||
[ "${BUMP_PKG_REV}" = "yes" ] && bump_pkg_rev "${ADDON_PATH}" "${ADDON}"
|
||||
echo "========================================================================"
|
||||
fi
|
||||
|
||||
if [ "${KEEP_GIT_DIRS}" != "yes" ]; then
|
||||
[ -d "${GIT_DIR}" ] && rm -rf "${GIT_DIR}"
|
||||
if [ ! -z "${NEW_VERSION}" ]; then
|
||||
echo "Resolved version for ${ADDON}: ${GIT_BRANCH} => ${NEW_VERSION}"
|
||||
|
||||
if update_pkg "${ADDON_PATH}" ${ADDON} ${NEW_VERSION}; then
|
||||
if [ -n "${NO_TAG}" ]; then
|
||||
# always bump PKG_REV on updates as we have no info if version changed
|
||||
bump_pkg_rev "${ADDON_PATH}" "${ADDON}"
|
||||
else
|
||||
reset_pkg_rev "${ADDON_PATH}" "${ADDON}"
|
||||
fi
|
||||
else
|
||||
[ "${BUMP_PKG_REV}" = "yes" ] && bump_pkg_rev "${ADDON_PATH}" "${ADDON}"
|
||||
fi
|
||||
|
||||
if [ "${KEEP_GIT_DIRS}" != "yes" ]; then
|
||||
[ -d "${GIT_DIR}" ] && rm -rf "${GIT_DIR}"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo "[mkpkg] Skipped $ADDON"
|
||||
@ -188,6 +201,9 @@ for ADDON in $(ls -1 "${ROOT}/packages/mediacenter/kodi-binary-addons"); do
|
||||
|
||||
check_package_excluded "${ADDON}" "${EXCLUDED_PACKAGES}" && continue
|
||||
|
||||
# always continue when UPDATE_TO_HASH=no as the below code does not work on tags
|
||||
[ "${UPDATE_TO_HASH}" != "yes" ] && continue
|
||||
|
||||
ADDON_PATH="${ROOT}/packages/mediacenter/kodi-binary-addons/${ADDON}/"
|
||||
# Obtain git url - ignore if not a suitable repo
|
||||
GIT_DIR="${ADDON}.git"
|
||||
|
Loading…
x
Reference in New Issue
Block a user