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

Merge pull request #496 from MilhouseVH/17.0-alpha2-d9fd774-p4

Browse Source 
kodi-binary-addons: Fix update_binary-addons
This commit is contained in:
Christian Hewitt 2016-06-28 00:31:27 +04:00 committed by GitHub
commit df3c36b5bd
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/kodi-binary-addons/inputstream.mpd/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="inputstream.mpd"
PKG_VERSION="350838d"
PKG_VERSION="b171dff"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
PKG_URL="https://github.com/liberty-developer/inputstream.mpd/archive/$PKG_VERSION.tar.gz"

2
packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="pvr.stalker"
PKG_VERSION="acba9f1"
PKG_VERSION="ad1f7d6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="screensaver.shadertoy"
PKG_VERSION="394de3d"
PKG_VERSION="9e0d1e4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

28
tools/mkpkg/update_binary-addons
View File

@ -72,6 +72,22 @@ geturl() {
return 0
}
# For the specified addon, verify that the package url
# matches the url retrieved from Kodi
validate_pkg_url() {
local addon="$1" url1="$2"
local domain owner repo url2
domain="$(echo "${url1}" | cut -d/ -f3)"
owner="$(echo "${url1}" | cut -d/ -f4)"
repo="$(echo "${url1}" | cut -d/ -f5)"
url1="git://${domain}/${owner}/${repo}.git"
url2="$(geturl "${addon}")"
[ "${url1}" = "${url2}" ] && return 0 || return 1
}
if [ ! -d $KODI_DIR ] ; then
echo "meh.. $KODI_DIR does not exist"
exit 127
@ -105,9 +121,6 @@ if [ -f ../../packages/mediacenter/kodi-platform/package.mk ] ; then
fi
rm -rf $PKG_NAME.git
PROCESSED=/tmp/update_binary_addons.dat
rm -f ${PROCESSED}
# addons
for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.txt ; do
ADDONS=$(cat $addontxt | awk '{print $1}')
@ -120,7 +133,11 @@ for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.t
GIT_HASH=$(cat $addon/$ADDON.txt | awk '{print $3}')
PKG_NAME="$ADDON"
echo "${PKG_NAME}" >> ${PROCESSED}
# 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}${PKG_NAME}\n"
if ! grep -q all $addon/platforms.txt && ! grep -q linux $addon/platforms.txt && ! grep -q ! $addon/platforms.txt; then
continue
@ -136,7 +153,6 @@ for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.t
-i ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk
rm -rf $PKG_NAME.git
else
echo "[mkpkg] Skipped $ADDON"
SKIPPED_ADDONS="$SKIPPED_ADDONS $ADDON"
@ -149,7 +165,7 @@ done
# finally, any other unofficial addons
for ADDON in $(ls -1 ../../packages/mediacenter/kodi-binary-addons); do
# ignore already processed addons
grep -qE "^${ADDON}$" ${PROCESSED} && continue
echo -e "${PROCESSED}" | grep -qE "^${ADDON}$" && continue
# Obtain git url - ignore if not a suitable repo
REPO="$(geturl "${ADDON}")" || continue