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

update_binary-addons: fix unquoted path variables

Browse Source 
also change missing tag ERROR to WARNING

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2019-02-28 20:37:25 +01:00
parent 4c170f5b0b
commit de946a4c5a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/mkpkg/update_binary-addons
View File

@ -98,7 +98,7 @@ validate_pkg_url() {
get_pkg_var() { get_pkg_var() {
local pkg_name="$1" pkg_var="$2" local pkg_name="$1" pkg_var="$2"
cd ${ROOT} cd "${ROOT}"
PROJECT=Generic ARCH=x86_64 source config/options ${pkg_name} &>/dev/null PROJECT=Generic ARCH=x86_64 source config/options ${pkg_name} &>/dev/null
echo "${!pkg_var}" echo "${!pkg_var}"
} }
@ -110,12 +110,12 @@ update_pkg() {
old_version=$(get_pkg_var "${pkg_name}" PKG_VERSION) old_version=$(get_pkg_var "${pkg_name}" PKG_VERSION)
if [ "${old_version}" != "${pkg_version}" ]; then if [ "${old_version}" != "${pkg_version}" ]; then
[ -n "$pkg_version}" ] && sed -e "s|PKG_VERSION=.*|PKG_VERSION=\"${pkg_version}\"|g" -i ${pkg_path} [ -n "$pkg_version}" ] && sed -e "s|PKG_VERSION=.*|PKG_VERSION=\"${pkg_version}\"|g" -i "${pkg_path}"
pkg_url=$(get_pkg_var "${pkg_name}" PKG_URL) pkg_url=$(get_pkg_var "${pkg_name}" PKG_URL)
new_sha256="$(wget -q ${pkg_url} -O- | sha256sum | awk '{print $1}')" || exit 1 new_sha256="$(wget -q ${pkg_url} -O- | sha256sum | awk '{print $1}')" || exit 1
sed -e "s|PKG_SHA256=.*|PKG_SHA256=\"${new_sha256}\"|g" -i ${pkg_path} sed -e "s|PKG_SHA256=.*|PKG_SHA256=\"${new_sha256}\"|g" -i "${pkg_path}"
if [ "${BUMP_PKG_REV}" = "yes" ]; then if [ "${BUMP_PKG_REV}" = "yes" ]; then
pkg_rev=$(get_pkg_var "${pkg_name}" PKG_REV) pkg_rev=$(get_pkg_var "${pkg_name}" PKG_REV)
@ -135,14 +135,14 @@ update_to_latest_tag() {
resolved_version=$(resolve_tag ${gitdir} ${ref}) resolved_version=$(resolve_tag ${gitdir} ${ref})
if [ -z "${resolved_version}" ]; then if [ -z "${resolved_version}" ]; then
echo "========================================================================" echo "========================================================================"
echo "ERROR: no tag found for package ${pkg_name}, falling back to HEAD" echo "WARNING: no tag found for package ${pkg_name}, falling back to HEAD"
echo "========================================================================" echo "========================================================================"
resolved_version=$(resolve_hash ${gitdir} ${ref}) resolved_version=$(resolve_hash ${gitdir} ${ref})
fi fi
echo "Resolved version for ${pkg_name}: ${ref} => ${resolved_version}" echo "Resolved version for ${pkg_name}: ${ref} => ${resolved_version}"
update_pkg ${package_mk} ${pkg_name} ${resolved_version} update_pkg "${package_mk}" ${pkg_name} ${resolved_version}
if [ "${KEEP_GIT_DIRS}" != "yes" ]; then if [ "${KEEP_GIT_DIRS}" != "yes" ]; then
rm -rf ${gitdir} rm -rf ${gitdir}
@ -159,11 +159,11 @@ GIT_HASH=$(cat $KODI_DIR/cmake/addons/depends/common/p8-platform/p8-platform.txt
PKG_NAME="p8-platform" PKG_NAME="p8-platform"
git_clone $REPO master $PKG_NAME.git $GIT_HASH git_clone $REPO master $PKG_NAME.git $GIT_HASH
if [ -f ${ROOT}/packages/mediacenter/p8-platform/package.mk ] ; then if [ -f "${ROOT}/packages/mediacenter/p8-platform/package.mk" ] ; then
# update package.mk # update package.mk
RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH) RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
echo "Resolving hash for ${PKG_NAME}: ${GIT_HASH} => ${RESOLVED_HASH}" echo "Resolving hash for ${PKG_NAME}: ${GIT_HASH} => ${RESOLVED_HASH}"
sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ${ROOT}/packages/mediacenter/p8-platform/package.mk sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" "${ROOT}/packages/mediacenter/p8-platform/package.mk"
fi fi
if [ "${KEEP_GIT_DIRS}" != "yes" ]; then if [ "${KEEP_GIT_DIRS}" != "yes" ]; then
rm -rf $PKG_NAME.git rm -rf $PKG_NAME.git
@ -175,10 +175,10 @@ GIT_HASH=$(cat $KODI_DIR/cmake/addons/depends/common/kodi-platform/kodi-platform
PKG_NAME="kodi-platform" PKG_NAME="kodi-platform"
git_clone $REPO master $PKG_NAME.git $GIT_HASH git_clone $REPO master $PKG_NAME.git $GIT_HASH
if [ -f ${ROOT}/packages/mediacenter/kodi-platform/package.mk ] ; then if [ -f "${ROOT}/packages/mediacenter/kodi-platform/package.mk" ] ; then
# update package.mk # update package.mk
RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH) RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
update_pkg ${ROOT}/packages/mediacenter/kodi-platform/package.mk ${PKG_NAME} ${RESOLVED_HASH} update_pkg "${ROOT}/packages/mediacenter/kodi-platform/package.mk" ${PKG_NAME} ${RESOLVED_HASH}
fi fi
if [ "${KEEP_GIT_DIRS}" != "yes" ]; then if [ "${KEEP_GIT_DIRS}" != "yes" ]; then
rm -rf $PKG_NAME.git rm -rf $PKG_NAME.git
@ -208,9 +208,9 @@ for addontxt in $KODI_DIR/cmake/addons/bootstrap/repositories/*-addons.txt ; do
continue continue
fi fi
if [ -f ${ROOT}/packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ] ; then if [ -f "${ROOT}/packages/mediacenter/kodi-binary-addons/$ADDON/package.mk" ] ; then
update_to_latest_tag \ update_to_latest_tag \
${ROOT}/packages/mediacenter/kodi-binary-addons/${ADDON}/package.mk \ "${ROOT}/packages/mediacenter/kodi-binary-addons/${ADDON}/package.mk" \
${ADDON} ${REPO} ${KODI_BRANCH} ${GIT_HASH} ${ADDON} ${REPO} ${KODI_BRANCH} ${GIT_HASH}
else else
echo "[mkpkg] Skipped $ADDON" echo "[mkpkg] Skipped $ADDON"
@ -225,7 +225,7 @@ for addontxt in $KODI_DIR/cmake/addons/bootstrap/repositories/*-addons.txt ; do
done done
# finally, any other unofficial addons # finally, any other unofficial addons
for ADDON in $(ls -1 ${ROOT}/packages/mediacenter/kodi-binary-addons); do for ADDON in $(ls -1 "${ROOT}/packages/mediacenter/kodi-binary-addons"); do
[[ ${ADDON} =~ ^game.* ]] && continue # ignore game.* addons - handled by update_retroplayer-addons [[ ${ADDON} =~ ^game.* ]] && continue # ignore game.* addons - handled by update_retroplayer-addons
# ignore already processed addons # ignore already processed addons
@ -239,7 +239,7 @@ for ADDON in $(ls -1 ${ROOT}/packages/mediacenter/kodi-binary-addons); do
# update package.mk for stale github.com packages # update package.mk for stale github.com packages
RESOLVED_HASH=$(resolve_hash ${ADDON}.git HEAD) || continue RESOLVED_HASH=$(resolve_hash ${ADDON}.git HEAD) || continue
echo "Resolving hash for ${ADDON}: HEAD => ${RESOLVED_HASH}" echo "Resolving hash for ${ADDON}: HEAD => ${RESOLVED_HASH}"
update_pkg ${ROOT}/packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ${ADDON} ${RESOLVED_HASH} update_pkg "${ROOT}/packages/mediacenter/kodi-binary-addons/$ADDON/package.mk" ${ADDON} ${RESOLVED_HASH}
if [ "${KEEP_GIT_DIRS}" != "yes" ]; then if [ "${KEEP_GIT_DIRS}" != "yes" ]; then
rm -rf $ADDON.git rm -rf $ADDON.git