* Remove non free packages on db-update

2 files changed, 17 insertions, 1 deletions

diff --git a/config b/config
index 6936a9b..effdde4 100644
--- a/config
+++ b/config
@@ -33,3 +33,4 @@ PKGEXT=".pkg.tar.?z"
 SRCEXT=".src.tar.gz"
 
 MAKEPKGCONF="$HOME/etc/makepkg.conf"
+BLACKLIST_FILE="$HOME/parabolagnulinux.org/docs/blacklist.txt"
\ No newline at end of file
diff --git a/db-update b/db-update
index 7604547..6c220d9 100755
--- a/db-update
+++ b/db-update
@@ -69,7 +69,7 @@ for repo in ${repos[@]}; do
 			if [ -f "$FTP_BASE/${PKGPOOL}/${pkgfile}.sig" ]; then
 				ln -s "../../../${PKGPOOL}/${pkgfile}.sig" "$FTP_BASE/$repo/os/${pkgarch}"
 			fi
-			add_pkgs[${#add_pkgs[*]}]=${pkgfile}
+			add_pkgs[${#add_pkgs[*]}]=${pkgfile} 
 		done
 		if [ ${#add_pkgs[@]} -ge 1 ]; then
 			arch_repo_add "${repo}" "${pkgarch}" ${add_pkgs[@]}
@@ -77,6 +77,21 @@ for repo in ${repos[@]}; do
 	done
 done
 
+# Repo check nonfree
+nonfree=($(cut -d: -f1 ${BLACKLIST_FILE}))
+for repo in ${ARCHREPOS[@]}; do
+    for pkgarch in ${ARCHARCHES[@]}; do
+	cleanpkgs=()
+	dbpkgs=($(bsdtar -xOf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" | awk '/^%NAME%/{getline;print}' | sort ))
+	for pkgname in ${dbpkgs[@]}; do
+	    if in_array ${pkgname} ${nonfree[@]}; then
+		cleanpkgs[${#cleanpkgs[*]}]=${pkgname}
+	    fi
+	done
+	arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]}
+    done
+done
+
 for repo in ${repos[@]}; do
 	for pkgarch in ${ARCHES[@]}; do
 		repo_unlock ${repo} ${pkgarch}