Merge pull request #2311 from Kwiboo/create_addon

scripts/create_addon: improve PKG_ADDON_PROJECTS check
This commit is contained in:
MilhouseVH 2017-12-13 03:00:07 +00:00 committed by GitHub
commit 64e55e4d82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions

View File

@ -20,7 +20,7 @@ PKG_NAME="repository.linuxserver.docker"
PKG_VERSION="9.0"
PKG_REV="102"
PKG_ARCH="any"
PKG_ADDON_PROJECTS="Generic RPi RPi2 WeTek_Hub WeTek_Play_2 Odroid_C2"
PKG_ADDON_PROJECTS="any !WeTek_Core !WeTek_Play"
PKG_LICENSE="GPL"
PKG_SITE="https://linuxserver.io"
PKG_URL=""

View File

@ -22,7 +22,7 @@ PKG_VERSION="17.10.0"
PKG_SHA256="90f54b988d5241ee0472800e139e0628ae8a58dac168bb32fdb031383f3b46be"
PKG_REV="117"
PKG_ARCH="any"
PKG_ADDON_PROJECTS="Generic RPi RPi2 WeTek_Hub WeTek_Play_2 Odroid_C2"
PKG_ADDON_PROJECTS="any !WeTek_Core !WeTek_Play"
PKG_LICENSE="ASL"
PKG_SITE="http://www.docker.com/"
PKG_URL="https://github.com/docker/docker-ce/archive/v${PKG_VERSION}-ce.tar.gz"

View File

@ -30,11 +30,14 @@ if [ -n "$PKG_ARCH" ]; then
listcontains "$PKG_ARCH" "$TARGET_ARCH" || listcontains "$PKG_ARCH" "any" || exit 0
fi
if [ -n "$PKG_ADDON_PROJECTS" -a ! "$PKG_ADDON_PROJECTS" = "any" ]; then
if ! listcontains "${PKG_ADDON_PROJECTS}" "${DEVICE:-${PROJECT}}"; then
echo "*** ERROR: $PKG_ADDON_ID: '${DEVICE:-${PROJECT}}' not supported ***"
exit 0
fi
not_supported() {
echo "*** ERROR: $PKG_ADDON_ID: '${DEVICE:-$PROJECT}' not supported ***"
exit 0
}
if [ -n "$PKG_ADDON_PROJECTS" ]; then
listcontains "$PKG_ADDON_PROJECTS" "!${DEVICE:-$PROJECT}" && not_supported
listcontains "$PKG_ADDON_PROJECTS" "${DEVICE:-$PROJECT}" || listcontains "$PKG_ADDON_PROJECTS" "any" || not_supported
fi
$SCRIPTS/checkdeps