Merge pull request #9260 from CvH/13.0/change_version_update

change_addon_version: add binary-addons
This commit is contained in:
Rudi Heitbaum 2024-10-29 23:32:36 +11:00 committed by GitHub
commit aacdbf8a0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -21,6 +21,8 @@ update_addon_version() {
echo "git commit \"distro: bump ADDON_VERSION to ${BUMP_ADDON_VERSION}\"" echo "git commit \"distro: bump ADDON_VERSION to ${BUMP_ADDON_VERSION}\""
git commit -qs -m "distro: bump ADDON_VERSION to ${BUMP_ADDON_VERSION}" "${DISTRIBUTION_PATH}" git commit -qs -m "distro: bump ADDON_VERSION to ${BUMP_ADDON_VERSION}" "${DISTRIBUTION_PATH}"
# wait for slow fs otherwise lock errors at git
sync
} }
update_package() { update_package() {
@ -37,6 +39,23 @@ update_package() {
# commit changes # commit changes
# avoid errors at commit by checking if changes are available # avoid errors at commit by checking if changes are available
git diff --quiet HEAD $REF -- packages/addons || { echo "git commit \"addons: reset version\"" && git commit -qs -m "addons: reset version" "packages/addons"; } git diff --quiet HEAD $REF -- packages/addons || { echo "git commit \"addons: reset version\"" && git commit -qs -m "addons: reset version" "packages/addons"; }
# wait for slow fs otherwise lock errors at git
sync
}
update_binary_addons() {
# update package.mk
for package_mk in $(find packages/mediacenter/kodi-binary-addons -type f -name "package.mk"); do
PKG_REV="$(grep -oP -m 1 '(?<=PKG_REV=\").*(?=\")' ${package_mk} || true)"
sed -e "s|PKG_REV=.*|PKG_REV=\"$(($PKG_REV + 1))\"|" -i "${package_mk}"
unset PKG_REV
done
# commit changes
# avoid errors at commit by checking if changes are available
git diff --quiet HEAD $REF -- packages/mediacenter/kodi-binary-addons || { echo "git commit \"addons: bump kodi-binary-addons\"" && git commit -qs -m "addons: bump kodi-binary-addons" "packages/mediacenter/kodi-binary-addons"; }
# wait for slow fs otherwise lock errors at git
sync
} }
# check if whiptail is installed and directly execute script when argument is supplied # check if whiptail is installed and directly execute script when argument is supplied
@ -50,6 +69,7 @@ else
BUMP_ADDON_VERSION="$1" BUMP_ADDON_VERSION="$1"
update_addon_version update_addon_version
update_package update_package
update_binary_addons
exit exit
fi fi
@ -62,6 +82,7 @@ case $OPTION in
"1") "1")
update_addon_version update_addon_version
update_package update_package
update_binary_addons
;; ;;
"2") "2")
BUMP_ADDON_VERSION=$(whiptail --inputbox "Enter ADDON-VERSION:" 10 25 ${DISTRO_ADDON_VERSION} 3>&1 1>&2 2>&3) BUMP_ADDON_VERSION=$(whiptail --inputbox "Enter ADDON-VERSION:" 10 25 ${DISTRO_ADDON_VERSION} 3>&1 1>&2 2>&3)
@ -69,6 +90,7 @@ case $OPTION in
if [ $EXITSTATUS = 0 ]; then if [ $EXITSTATUS = 0 ]; then
update_addon_version update_addon_version
update_package update_package
update_binary_addons
else else
exit exit
fi fi