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

Merge pull request #4082 from HiassofT/le10-unofficial-bump-fix

Browse Source 
update_binary-addons: fix unofficial addon bumping
This commit is contained in:
MilhouseVH 2020-01-08 16:10:51 +00:00 committed by GitHub
commit d234b73a23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/mkpkg/update_binary-addons
View File

@ -8,7 +8,7 @@ BUMP_PKG_REV=""
KEEP_GIT_DIRS="yes" KEEP_GIT_DIRS="yes"
usage() { usage() {
echo "Usage: $0 [options] <branch-name>" echo "Usage: $0 [options] <kodi-branch> [<unofficial-addon-branch>]"
echo " -b, --bump-pkg-rev: bump PKG_REV if package was not updated" 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 " -d, --delete-git-dirs: delete cloned git dirs after update"
echo " -h, --help: display help and exit" echo " -h, --help: display help and exit"
@ -40,7 +40,7 @@ while [ $# -ne 0 ]; do
esac esac
done done
if [ $# -ne 1 ]; then if [ $# -eq 0 -o $# -gt 2 ]; then
usage usage
exit 1 exit 1
fi fi
@ -60,6 +60,12 @@ mkdir -p "${TMPDIR}"
KODI_BRANCH="$1" KODI_BRANCH="$1"
KODI_DIR="kodi.git" KODI_DIR="kodi.git"
if [ $# -eq 1 ]; then
UNOFFICIAL_ADDON_BRANCH="${KODI_BRANCH}"
else
UNOFFICIAL_ADDON_BRANCH="$2"
fi
. "${MY_DIR}/update_common_functions" . "${MY_DIR}/update_common_functions"
git_clone https://github.com/xbmc/xbmc ${KODI_DIR} ${KODI_BRANCH} git_clone https://github.com/xbmc/xbmc ${KODI_DIR} ${KODI_BRANCH}
@ -165,9 +171,15 @@ for ADDON in $(ls -1 "${ROOT}/packages/mediacenter/kodi-binary-addons"); do
git_clone ${GIT_REPO} ${GIT_DIR} git_clone ${GIT_REPO} ${GIT_DIR}
# update package.mk for stale github.com packages if RESOLVED_HASH=$(resolve_hash_in_branch ${ADDON}.git ${UNOFFICIAL_ADDON_BRANCH}); then
RESOLVED_HASH=$(resolve_hash_in_branch ${ADDON}.git HEAD) || continue echo "Resolved hash for ${ADDON}: ${UNOFFICIAL_ADDON_BRANCH} => ${RESOLVED_HASH}"
echo "Resolving hash for ${ADDON}: HEAD => ${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 if update_pkg "${ADDON_PATH}" "${ADDON}" "${RESOLVED_HASH}"; then
# always bump PKG_REV when updating untagged addons # always bump PKG_REV when updating untagged addons
bump_pkg_rev "${ADDON_PATH}" "${ADDON}" bump_pkg_rev "${ADDON_PATH}" "${ADDON}"