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-cleanup | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'db-cleanup')

diff --git a/db-cleanup b/db-cleanup
index 57ef36e..a35bdf2 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -10,9 +10,9 @@
 # * Instant cleanup!
 
 trap_exit() {
-    echo
-    error "$@"
-    exit 1
+	echo
+	error "$@"
+	exit 1
 }
 
 source "$(dirname "$(readlink -e "$0")")/config"
@@ -28,35 +28,35 @@ trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
 ${CLEANUP_DRYRUN} && EXTRAFLAGS+=" --dry-run"
 
 for _repo in ${PKGREPOS[@]}; do
-    for _arch in ${ARCHES[@]}; do
-        msg "Getting ${_repo}-${_arch} database"
+	for _arch in ${ARCHES[@]}; do
+		msg "Getting ${_repo}-${_arch} database"
 
-        dbfile="${FTP_BASE}/${_repo}/os/${_arch}/${_repo}${DBEXT}"
+		dbfile="${FTP_BASE}/${_repo}/os/${_arch}/${_repo}${DBEXT}"
 
-        if [ ! -r "${dbfile}" ]; then
-            warning "Not found"
-            continue
-        fi
+		if [ ! -r "${dbfile}" ]; then
+			warning "Not found"
+			continue
+		fi
 
-# Echo the contents into a filter file
-        bsdtar tf "${dbfile}" | \
-            cut -d'/' -f1 | \
-            sort -u | \
-            sed "s|$|*|" >> /tmp/${0##*/}.$$.filter
+		# Echo the contents into a filter file
+		bsdtar tf "${dbfile}" | \
+			cut -d'/' -f1 | \
+			sort -u | \
+			sed "s|$|*|" >> /tmp/${0##*/}.$$.filter
 
-    done
+	done
 done
 
 msg "Removing old files:"
 
 for POOL in ${PKGPOOLS[@]} ${SRCPOOLS[@]}; do
-    msg2 "${POOL}"
+	msg2 "${POOL}"
 
-    rsync ${EXTRAFLAGS} -va --delete-excluded \
-          --include-from="/tmp/${0##*/}.$$.filter" \
-          --exclude="*" \
-          ${FTP_BASE}/${POOL}/ \
-          ${FTP_BASE}/${POOL}/
+	rsync ${EXTRAFLAGS} -va --delete-excluded \
+		--include-from="/tmp/${0##*/}.$$.filter" \
+		--exclude="*" \
+		${FTP_BASE}/${POOL}/ \
+		${FTP_BASE}/${POOL}/
 done
 
 msg "Removing symlinks:"
-- 
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-cleanup | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'db-cleanup')

diff --git a/db-cleanup b/db-cleanup
index a35bdf2..b2f2e08 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -25,10 +25,11 @@ trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT
 trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
 trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
 
-${CLEANUP_DRYRUN} && EXTRAFLAGS+=" --dry-run"
+EXTRAFLAGS=()
+"${CLEANUP_DRYRUN}" && EXTRAFLAGS+=(--dry-run)
 
-for _repo in ${PKGREPOS[@]}; do
-	for _arch in ${ARCHES[@]}; do
+for _repo in "${PKGREPOS[@]}"; do
+	for _arch in "${ARCHES[@]}"; do
 		msg "Getting ${_repo}-${_arch} database"
 
 		dbfile="${FTP_BASE}/${_repo}/os/${_arch}/${_repo}${DBEXT}"
@@ -42,25 +43,25 @@ for _repo in ${PKGREPOS[@]}; do
 		bsdtar tf "${dbfile}" | \
 			cut -d'/' -f1 | \
 			sort -u | \
-			sed "s|$|*|" >> /tmp/${0##*/}.$$.filter
+			sed "s|$|*|" >> "/tmp/${0##*/}.$$.filter"
 
 	done
 done
 
 msg "Removing old files:"
 
-for POOL in ${PKGPOOLS[@]} ${SRCPOOLS[@]}; do
+for POOL in "${PKGPOOLS[@]}" "${SRCPOOLS[@]}"; do
 	msg2 "${POOL}"
 
-	rsync ${EXTRAFLAGS} -va --delete-excluded \
+	rsync "${EXTRAFLAGS[@]}" -va --delete-excluded \
 		--include-from="/tmp/${0##*/}.$$.filter" \
 		--exclude="*" \
-		${FTP_BASE}/${POOL}/ \
-		${FTP_BASE}/${POOL}/
+		"${FTP_BASE}/${POOL}/" \
+		"${FTP_BASE}/${POOL}/"
 done
 
 msg "Removing symlinks:"
-find -L ${FTP_BASE}/ -type l 
-${CLEANUP_DRYRUN} || find -L ${FTP_BASE}/ -type l -delete
+find -L "${FTP_BASE}/" -type l
+"${CLEANUP_DRYRUN}" || find -L "${FTP_BASE}/" -type l -delete
 
 exit $?
-- 
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-cleanup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'db-cleanup')

diff --git a/db-cleanup b/db-cleanup
index b2f2e08..6ac9747 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -30,7 +30,7 @@ EXTRAFLAGS=()
 
 for _repo in "${PKGREPOS[@]}"; do
 	for _arch in "${ARCHES[@]}"; do
-		msg "Getting ${_repo}-${_arch} database"
+		msg "Getting %s-%s database" "${_repo}" "${_arch}"
 
 		dbfile="${FTP_BASE}/${_repo}/os/${_arch}/${_repo}${DBEXT}"
 
@@ -51,7 +51,7 @@ done
 msg "Removing old files:"
 
 for POOL in "${PKGPOOLS[@]}" "${SRCPOOLS[@]}"; do
-	msg2 "${POOL}"
+	msg2 '%s' "${POOL}"
 
 	rsync "${EXTRAFLAGS[@]}" -va --delete-excluded \
 		--include-from="/tmp/${0##*/}.$$.filter" \
-- 
cgit v1.2.3-2-g168b