jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 05:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4612 from HiassofT/le10-update-retroplayer

Browse Source 
update_retroplayer-addons: match lastest tag with kodi branch in name
This commit is contained in:
CvH 2020-10-21 20:51:35 +02:00 committed by GitHub
commit 942a68bf33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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() { resolve_tag_in_branch() {
local tag
if [ -d "$1" ] ; then if [ -d "$1" ] ; then
cd "$1" 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 git describe --abbrev=0 --tags origin/$2 2>/dev/null
fi fi
} }

2
tools/mkpkg/update_retroplayer-addons
View File

@ -115,7 +115,7 @@ for addon in ${ADDONS_DIR}/*.*/ ; do
CHECK_RETRO="" CHECK_RETRO=""
git_clone "${GAME_GIT_REPO}" "${GAME_GIT_DIR}" 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 if [ -z "${GAME_NEW_VERSION}" ]; then
NO_TAG="yes" NO_TAG="yes"
echo "========================================================================" echo "========================================================================"