From 23faa9361d79d1d88754a1e1e5aa9f040b34545c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 26 Oct 2013 01:35:45 -0400
Subject: Merge pkgbuild-check-{nonfree,licenses}, add a summarize tool for it.

This should fix a number of bugs in those two scripts, and the summarize
script simplifies aur and libremakepkg:hooks-check.sh
---
 src/chroot-tools/hooks-check.sh | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

(limited to 'src/chroot-tools')

diff --git a/src/chroot-tools/hooks-check.sh b/src/chroot-tools/hooks-check.sh
index e8120b8..2702f95 100644
--- a/src/chroot-tools/hooks-check.sh
+++ b/src/chroot-tools/hooks-check.sh
@@ -1,30 +1,11 @@
 #!/usr/bin/env bash
 set -euE
 
-hook_check_pkgbuild+=("check_pkgbuild_dependencies")
-check_pkgbuild_dependencies() {
+hook_check_pkgbuild+=("check_pkgbuild_nonfree")
+check_pkgbuild_nonfree() {
 	local s=0
 	sudo -EH -u "$LIBREUSER" pkgbuild-check-nonfree -f || s=$?
-	case $s in
-		0) :;;
-		15) error "This PKGBUILD links to known unfree packages"; return 1;;
-		*) warning "pkgbuild-check-nonfree failed to run";;
-	esac
-}
-
-hook_check_pkgbuild+=("check_pkgbuild_license")
-check_pkgbuild_license() {
-	local s=0
-	sudo -EH -u "$LIBREUSER" pkgbuild-check-licenses -f || s=$?
-	for i in 1 2 4; do
-		if [[ $i -eq $(($s & $i)) ]]; then
-			case $i in
-				1) warning "pkgbuild-check-licenses encountered an error";;
-				2) warning "This PKGBUILD has an uncommon license";;
-				4) error   "This PKGBUILD has a known nonfree license"; ret=1;;
-			esac
-		fi
-	done
+	pkgbuild-summarize-nonfree $s
 }
 
 #hook_check_pkgbuild+=("check_pkgbuild_namcap")
-- 
cgit v1.2.2