From 3d45f943876853b3a745914c8a5a74ffc039f99b Mon Sep 17 00:00:00 2001 From: Eric Bélanger Date: Wed, 14 Oct 2009 15:18:07 -0400 Subject: Moved chk_license to db-functions file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bélanger Signed-off-by: Aaron Griffin --- misc-scripts/make-sourceball | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'misc-scripts/make-sourceball') diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index 462549f..1e7eabc 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -61,33 +61,11 @@ pkgver_from_src() { echo $tmp | sed 's|.*-\(.*-.*\)$|\1|g' } -#usage: chk_license ${license[@]}" -chk_license() { - #The -f flag skips this check - if [ $FORCE = 1 ]; then - return 0 - fi - - local l - for l in "$@"; do - l="$(echo $l | tr '[:upper:]' '[:lower:]')" - for allowed in ${ALLOWED_LICENSES[@]}; do - allowed="$(echo $allowed | tr '[:upper:]' '[:lower:]')" - if [ "$l" = "$allowed" ]; then - return 0 - fi - done - done - - return 1 -} - create_srcpackage() { if [ -d "$1" ]; then pushd "$1" >/dev/null . "$BUILDSCRIPT" - - if ! chk_license ${license[@]}; then + if ! [ $FORCE == 1 ] && ! chk_license ${license[@]} ; then #Removed so as not to clutter failed.txt #echo -e "\t$packagename license (${license[@]}) does not require source tarballs" >&2 cleanup 0 -- cgit v1.2.3-24-g4f1b