update_binary-addons: prefer Kodi branch over HEAD for unofficial addons

This fixes bumping visualization.pictureit which has separate branches
for Leia and Matrix.

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2019-12-29 13:13:14 +01:00
parent e59cba6c89
commit 6f7e62d67a

View File

@ -165,9 +165,15 @@ for ADDON in $(ls -1 "${ROOT}/packages/mediacenter/kodi-binary-addons"); do
git_clone ${GIT_REPO} ${GIT_DIR}
# update package.mk for stale github.com packages
RESOLVED_HASH=$(resolve_hash_in_branch ${ADDON}.git HEAD) || continue
echo "Resolving hash for ${ADDON}: HEAD => ${RESOLVED_HASH}"
if RESOLVED_HASH=$(resolve_hash_in_branch ${ADDON}.git ${KODI_BRANCH}); then
echo "Resolved hash for ${ADDON}: ${KODI_BRANCH} => ${RESOLVED_HASH}"
elif RESOLVED_HASH=$(resolve_hash_in_branch ${ADDON}.git HEAD); then
echo "Resolved hash for ${ADDON}: HEAD => ${RESOLVED_HASH}"
else
msg_warn "WARNING: Could not resolve hash for ${ADDON}"
continue
fi
if update_pkg "${ADDON_PATH}" "${ADDON}" "${RESOLVED_HASH}"; then
# always bump PKG_REV when updating untagged addons
bump_pkg_rev "${ADDON_PATH}" "${ADDON}"