From 9e1a475b62b6c770b99009961ae52f695294a8fe Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 1 Mar 2019 16:30:07 +0100 Subject: [PATCH] update_binary-addons: make missing addon check work again Signed-off-by: Matthias Reichl --- tools/mkpkg/update_binary-addons | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/mkpkg/update_binary-addons b/tools/mkpkg/update_binary-addons index 2f5b83f750..e81f6649e1 100755 --- a/tools/mkpkg/update_binary-addons +++ b/tools/mkpkg/update_binary-addons @@ -65,23 +65,22 @@ for addontxt in $KODI_DIR/cmake/addons/bootstrap/repositories/*-addons.txt ; do REPO=$(cat $addon/$ADDON.txt | awk '{print $2}') GIT_HASH=$(cat $addon/$ADDON.txt | awk '{print $3}') - # Verify the Kodi repo matches our package repo - # If different, ignore the addon and process it later as an "unofficial" addon - validate_pkg_url "$ADDON" "$REPO" || continue - - PROCESSED="${PROCESSED}${ADDON}\n" - if ! grep -q all $addon/platforms.txt && ! grep -q linux $addon/platforms.txt && ! grep -q ! $addon/platforms.txt; then continue fi ADDON_PATH="${ROOT}/packages/mediacenter/kodi-binary-addons/$ADDON/" if [ -f "${ADDON_PATH}/package.mk" ] ; then + # Verify the Kodi repo matches our package repo + # If different, ignore the addon and process it later as an "unofficial" addon + validate_pkg_url "$ADDON" "$REPO" || continue + update_to_latest_tag "${ADDON_PATH}" ${ADDON} ${REPO} ${KODI_BRANCH} ${GIT_HASH} else echo "[mkpkg] Skipped $ADDON" SKIPPED_ADDONS="$SKIPPED_ADDONS $ADDON" fi + PROCESSED="${PROCESSED}${ADDON}\n" done echo