diff --git a/packages/addons/repository/repository.linuxserver.docker/package.mk b/packages/addons/repository/repository.linuxserver.docker/package.mk index a80245286b..2ad559cb6a 100644 --- a/packages/addons/repository/repository.linuxserver.docker/package.mk +++ b/packages/addons/repository/repository.linuxserver.docker/package.mk @@ -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="" diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 6d642d6434..1bcb86c9de 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -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" diff --git a/scripts/create_addon b/scripts/create_addon index 2be57c43ae..f6b9c22487 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -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