From df49c9b89e56b6c8d2d20cdcc9e03dc80996fcdd Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 12:36:33 -0400
Subject: use tab indent

---
 db-check-nonfree | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'db-check-nonfree')

diff --git a/db-check-nonfree b/db-check-nonfree
index 6e2dc17..b08b7b1 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -18,25 +18,25 @@ done
 msg "Check nonfree in repo:"
 nonfree=($(cut -d: -f1 ${BLACKLIST_FILE} | sort -u))
 for repo in "${ARCHREPOS[@]}"; do
-    for pkgarch in "${ARCHES[@]}"; do
-	msg2 "$repo $pkgarch"
-	if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then
-	    continue
-	fi
-	unset dbpkgs
-	unset cleanpkgs
-	cleanpkgs=()
-	dbpkgs=($(bsdtar -xOf "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" | awk '/^%NAME%/{getline;print}' | sort -u ))
-	for pkgname in "${dbpkgs[@]}"; do
-	    if in_array "${pkgname}" "${nonfree[@]}"; then
-            cleanpkgs+=("${pkgname}")
-	    fi
+	for pkgarch in "${ARCHES[@]}"; do
+		msg2 "$repo $pkgarch"
+		if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then
+			continue
+		fi
+		unset dbpkgs
+		unset cleanpkgs
+		cleanpkgs=()
+		dbpkgs=($(bsdtar -xOf "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" | awk '/^%NAME%/{getline;print}' | sort -u ))
+		for pkgname in "${dbpkgs[@]}"; do
+			if in_array "${pkgname}" "${nonfree[@]}"; then
+				cleanpkgs+=("${pkgname}")
+			fi
+		done
+		if [ ${#cleanpkgs[@]} -ge 1 ]; then
+			msg2 "Nonfree: ${cleanpkgs[*]}"
+			arch_repo_remove "${repo}" "${pkgarch}" "${cleanpkgs[@]}"
+		fi
 	done
-	if [ ${#cleanpkgs[@]} -ge 1 ]; then
-        msg2 "Nonfree: ${cleanpkgs[*]}"
-	    arch_repo_remove "${repo}" "${pkgarch}" "${cleanpkgs[@]}"
-	fi
-    done
 done
 
 for repo in "${repos[@]}"; do
-- 
cgit v1.2.3-2-g168b


From 46510e1fc48f37ce76c2bf5f19f885bba8d5d098 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 13:05:12 -0400
Subject: Clean up quoting.

---
 db-check-nonfree | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'db-check-nonfree')

diff --git a/db-check-nonfree b/db-check-nonfree
index b08b7b1..cae4a14 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -11,12 +11,12 @@ fi
 # TODO: this might lock too much (architectures)
 for repo in "${repos[@]}"; do
 	for pkgarch in "${ARCHES[@]}"; do
-		repo_lock ${repo} ${pkgarch} || exit 1
+		repo_lock "${repo}" "${pkgarch}" || exit 1
 	done
 done
 
 msg "Check nonfree in repo:"
-nonfree=($(cut -d: -f1 ${BLACKLIST_FILE} | sort -u))
+nonfree=($(cut -d: -f1 "${BLACKLIST_FILE}" | sort -u))
 for repo in "${ARCHREPOS[@]}"; do
 	for pkgarch in "${ARCHES[@]}"; do
 		msg2 "$repo $pkgarch"
@@ -41,6 +41,6 @@ done
 
 for repo in "${repos[@]}"; do
 	for pkgarch in "${ARCHES[@]}"; do
-		repo_unlock ${repo} ${pkgarch}
+		repo_unlock "${repo}" "${pkgarch}"
 	done
 done
-- 
cgit v1.2.3-2-g168b


From 386c2d00249eb244bbcc9a173a64f9435b70180a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 13:45:10 -0400
Subject: Use printf formatters instead of string interpolation.

I used this command to find them:

    egrep -r --exclude-dir={test,.git} '(plain|msg|msg2|warning|error|stat_busy|stat_done|abort|die)\s+"?[^"]*\$'
---
 db-check-nonfree | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'db-check-nonfree')

diff --git a/db-check-nonfree b/db-check-nonfree
index cae4a14..c1673c3 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -4,7 +4,7 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -ge 1 ]; then
-	warning "Calling ${0##*/} with a specific repository is not supported"
+	warning "Calling %s with a specific repository is not supported" "${0##*/}"
 	exit 1
 fi
 
@@ -19,7 +19,7 @@ msg "Check nonfree in repo:"
 nonfree=($(cut -d: -f1 "${BLACKLIST_FILE}" | sort -u))
 for repo in "${ARCHREPOS[@]}"; do
 	for pkgarch in "${ARCHES[@]}"; do
-		msg2 "$repo $pkgarch"
+		msg2 "%s %s" "$repo" "$pkgarch"
 		if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then
 			continue
 		fi
@@ -33,7 +33,7 @@ for repo in "${ARCHREPOS[@]}"; do
 			fi
 		done
 		if [ ${#cleanpkgs[@]} -ge 1 ]; then
-			msg2 "Nonfree: ${cleanpkgs[*]}"
+			msg2 "Nonfree: %s" "${cleanpkgs[*]}"
 			arch_repo_remove "${repo}" "${pkgarch}" "${cleanpkgs[@]}"
 		fi
 	done
-- 
cgit v1.2.3-2-g168b