jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

update_retroplayer-addons: match lastest tag with kodi branch in name

Browse Source 
If no tag with the kodi branch name can be found, fall back to the
latest tag in the branch.

This fixes ambiguity if both a -Leia and a -Matrix tag point to the
same githash.

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2020-10-17 18:48:55 +02:00
parent ec1292ba3f
commit 99b6f9c94e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/mkpkg/update_common_functions
View File

@ -61,8 +61,16 @@ resolve_hash_in_branch() {
}
resolve_tag_in_branch() {
local tag
if [ -d "$1" ] ; then
cd "$1"
if [ $# -eq 3 ] ; then
tag=$(git describe --abbrev=0 --tags --match "$3" origin/$2 2>/dev/null)
if [ -n "$tag" ] ; then
echo "$tag"
return
fi
fi
git describe --abbrev=0 --tags origin/$2 2>/dev/null
fi
}

2
tools/mkpkg/update_retroplayer-addons
View File

@ -115,7 +115,7 @@ for addon in ${ADDONS_DIR}/*.*/ ; do
CHECK_RETRO=""
git_clone "${GAME_GIT_REPO}" "${GAME_GIT_DIR}"
GAME_NEW_VERSION=$(resolve_tag_in_branch "${GAME_GIT_DIR}" "${GAME_GIT_BRANCH}")
GAME_NEW_VERSION=$(resolve_tag_in_branch "${GAME_GIT_DIR}" "${GAME_GIT_BRANCH}" "*-${KODI_BRANCH}")
if [ -z "${GAME_NEW_VERSION}" ]; then
NO_TAG="yes"
echo "========================================================================"