clean up cron-jobs/sourceballs*

2 files changed, 3 insertions, 66 deletions

diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index c12a128..3722449 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -63,11 +63,10 @@ for repo in "${PKGREPOS[@]}"; do
 		if grep -Fqx "${pkgbase}" "${dirname}/sourceballs.skip"; then
 			continue
 		fi
-		# Commenting out, we'll sourceball everything
 		# Check if the license or .force file does not enforce creating a source package
-#		if ! (chk_license ${pkglicense[@]} || grep -Fqx "${pkgbase}" "${dirname}/sourceballs.force"); then
-#			continue
-#		fi
+		if ! ([[ ${#ALLOWED_LICENSES[@]} -eq 0 ]] || chk_license ${pkglicense[@]} || grep -Fqx "${pkgbase}" "${dirname}/sourceballs.force"); then
+			continue
+		fi
 		# Store the expected file name of the source package
 		echo "${pkgbase}-${pkgver}${SRCEXT}" >> "${WORKDIR}/expected-src-pkgs"
 
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
deleted file mode 100755
index e935f86..0000000
--- a/cron-jobs/sourceballs2
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-# Steps
-# Traverse ABSLibre
-# Makepkg --allsource every package
-# Remove the old sourceballs
-
-dirname="$(dirname "$(readlink -e "$0")")"
-. "${dirname}/../config"
-. "${dirname}/../db-functions"
-. "${MAKEPKGCONF}"
-
-pushd "${WORKDIR}" >/dev/null
-
-script_lock
-
-# Adjust the nice level to run at a lower priority
-renice +10 -p $$ > /dev/null
-
-# Create a list of all available source package file names
-find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
-
-pushd "${SVNREPO}" >/dev/null
-
-for repo in "${PKGREPOS[@]}"; do
-	msg "Sourceballing [%s]" "${repo}"
-
-	pushd "$repo" >/dev/null
-	find -maxdepth 1 -type d | while read pkg; do
-		pushd "${SVNREPO}/$repo/$pkg" >/dev/null
-
-		[[ ! -e ./PKGBUILD ]] && {
-			warning "%s is not a package" "$repo/$pkg"
-			continue
-		}
-
-		# Unset the previous data
-		unset pkgbase pkgname pkgver pkgrel
-		source PKGBUILD
-
-		unset build package url pkgdesc source md5sums depends makedepends \
-			optdepends license arch options check mksource
-
-		for _pkg in "${pkgname[@]}"; do
-			unset "package_${_pkg}" >/dev/null 2>&1
-		done
-
-		pkgbase=${pkgbase:-$pkgname}
-		srcfile="${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}"
-
-		echo "${srcfile}" >> "${WORKDIR}/expected-src-pkgs"
-
-		# Skip already sourceballed
-		[ -e "${SRCPKGDEST}/${srcfile}" ] && continue
-
-		makepkg --allsource --ignorearch -c >/dev/null 2>&1
-
-		[ $? -ne 0 ] && plain '%s' "${srcfile}"
-
-	done # end find pkgs
-	popd >/dev/null
-
-done # end repos