From 6f7e62d67a68db11dfcd8b1dc4d83bbd79dcc512 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sun, 29 Dec 2019 13:13:14 +0100
Subject: [PATCH] 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>
---
 tools/mkpkg/update_binary-addons | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/mkpkg/update_binary-addons b/tools/mkpkg/update_binary-addons
index 31086704ef..32cb6b67cc 100755
--- a/tools/mkpkg/update_binary-addons
+++ b/tools/mkpkg/update_binary-addons
@@ -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}"