From 8b2ae5b3e88413717fb86429a8435e4b3a4c94f0 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Fri, 12 Apr 2019 17:21:34 +0300 Subject: [PATCH] package_uploader.sh: handle licenses "custom" and "non-free" --- scripts/package_uploader.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/package_uploader.sh b/scripts/package_uploader.sh index d56c4eac8..15b580538 100755 --- a/scripts/package_uploader.sh +++ b/scripts/package_uploader.sh @@ -142,7 +142,7 @@ emergency_exit() { json_metadata_dump() { local old_ifs=$IFS local license - local pkg_licenses + local pkg_licenses="" IFS="," for license in ${PACKAGE_METADATA['LICENSES']}; do @@ -550,10 +550,8 @@ process_packages() { msg " * ${package_name}: skipping because field 'TERMUX_PKG_LICENSE' is empty." SCRIPT_ERROR_EXIT=true continue - elif grep -qP '.*custom.*' <(echo "${PACKAGE_METADATA['LICENSES']}"); then - msg " * ${package_name}: skipping because it has custom license." - SCRIPT_ERROR_EXIT=true - continue + elif grep -qP '.*(custom|non-free).*' <(echo "${PACKAGE_METADATA['LICENSES']}"); then + PACKAGE_METADATA["LICENSES"]="" fi PACKAGE_METADATA["DESCRIPTION"]=$(get_package_property "$package_name" "TERMUX_PKG_DESCRIPTION")