From d438ff5d25372ba32e42f89c808f5b33a25042f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Wed, 3 Aug 2011 16:13:56 -0300
Subject: Changed SVN to ABSLibre

---
 db-remove | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index b44eb33..ccfeb36 100755
--- a/db-remove
+++ b/db-remove
@@ -12,9 +12,6 @@ pkgbase="$1"
 repo="$2"
 arch="$3"
 
-ftppath="$FTP_BASE/$repo/os"
-svnrepo="$repo-$arch"
-
 if ! check_repo_permission $repo; then
 	die "You don't have permission to remove packages from ${repo}"
 fi
@@ -30,14 +27,11 @@ for tarch in ${tarches[@]}; do
 done
 
 msg "Removing $pkgbase from [$repo]..."
-/usr/bin/svn checkout -q "${SVNREPO}/${pkgbase}" "${WORKDIR}/svn/${pkgbase}" >/dev/null
 
-if [ -d "${WORKDIR}/svn/$pkgbase/repos/$svnrepo" ]; then
-	pkgnames=($(. "${WORKDIR}/svn/$pkgbase/repos/$svnrepo/PKGBUILD"; echo ${pkgname[@]}))
-	/usr/bin/svn rm --force -q "${WORKDIR}/svn/$pkgbase/repos/$svnrepo"
-	/usr/bin/svn commit -q "${WORKDIR}/svn/$pkgbase" -m "$(basename $0): $pkgbase removed by $(id -un)"
+if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
+	pkgnames=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo ${pkgname[@]}))
 else
-	warning "$pkgbase not found in $svnrepo"
+	warning "$pkgbase not found in $repo"
 	warning "Removing only $pkgbase from the repo"
 	warning "If it was a split package you have to remove the others yourself!"
 	pkgnames=($pkgbase)
-- 
cgit v1.2.3-2-g168b


From 33b8cb611363102e23972cf3914a03d65cb3cad8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 17 Jun 2013 23:59:15 -0600
Subject: use xbs, not svn

---
 db-remove | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 25cb9a7..e632c47 100755
--- a/db-remove
+++ b/db-remove
@@ -12,9 +12,6 @@ repo="$1"
 arch="$2"
 pkgbases=(${@:3})
 
-ftppath="$FTP_BASE/$repo/os"
-svnrepo="$repo-$arch"
-
 if ! check_repo_permission $repo; then
 	die "You don't have permission to remove packages from ${repo}"
 fi
@@ -32,14 +29,12 @@ done
 remove_pkgs=()
 for pkgbase in ${pkgbases[@]}; do
 	msg "Removing $pkgbase from [$repo]..."
-	arch_svn checkout -q "${SVNREPO}/${pkgbase}" "${WORKDIR}/svn/${pkgbase}" >/dev/null
-
-	if [ -d "${WORKDIR}/svn/$pkgbase/repos/$svnrepo" ]; then
-		remove_pkgs=(${remove_pkgs[@]} $(. "${WORKDIR}/svn/$pkgbase/repos/$svnrepo/PKGBUILD"; echo ${pkgname[@]}))
-		arch_svn rm --force -q "${WORKDIR}/svn/$pkgbase/repos/$svnrepo"
-		arch_svn commit -q "${WORKDIR}/svn/$pkgbase" -m "${0##*/}: $pkgbase removed by $(id -un)"
+	path="$(xbs releasepath "$pkgbase" "$repo" "$arch")"
+	if [ -d "$path" ]; then
+		remove_pkgs+=($(. "$path/PKGBUILD"; echo ${pkgname[@]}))
+		xbs unrelease "$pkgbase" "$repo" "$arch"
 	else
-		warning "$pkgbase not found in $svnrepo"
+		warning "$pkgbase not found in $repo-$arch"
 		warning "Removing only $pkgbase from the repo"
 		warning "If it was a split package you have to remove the others yourself!"
 		remove_pkgs[${#remove_pkgs[*]}]=$pkgbase
-- 
cgit v1.2.3-2-g168b


From 761b56dcffedc6e484d38c74267810e491add951 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 16 Jun 2013 22:06:51 -0600
Subject: touch up

---
 db-remove | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index e632c47..ccab5ea 100755
--- a/db-remove
+++ b/db-remove
@@ -17,12 +17,12 @@ if ! check_repo_permission $repo; then
 fi
 
 if [ "$arch" == "any" ]; then
-	tarches=(${ARCHES[@]})
+	tarches=("${ARCHES[@]}")
 else
 	tarches=("$arch")
 fi
 
-for tarch in ${tarches[@]}; do
+for tarch in "${tarches[@]}"; do
 	repo_lock $repo $tarch || exit 1
 done
 
@@ -37,11 +37,11 @@ for pkgbase in ${pkgbases[@]}; do
 		warning "$pkgbase not found in $repo-$arch"
 		warning "Removing only $pkgbase from the repo"
 		warning "If it was a split package you have to remove the others yourself!"
-		remove_pkgs[${#remove_pkgs[*]}]=$pkgbase
+		remove_pkgs+=($pkgbase)
 	fi
 done
 
-for tarch in ${tarches[@]}; do
-	arch_repo_remove "${repo}" "${tarch}" ${remove_pkgs[@]}
+for tarch in "${tarches[@]}"; do
+	arch_repo_remove "${repo}" "${tarch}" "${remove_pkgs[@]}"
 	repo_unlock $repo $tarch
 done
-- 
cgit v1.2.3-2-g168b


From e6294556d3197b7d87f7659355d0e189fad613d6 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 8 Dec 2013 17:33:25 -0500
Subject: `readlink -e` all "$0"s

---
 db-remove | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index ccab5ea..993574f 100755
--- a/db-remove
+++ b/db-remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/config"
-. "$(dirname $0)/db-functions"
+. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: ${0##*/} <repo> <arch> <pkgname|pkgbase> ..."
-- 
cgit v1.2.3-2-g168b


From 91f6039acb4ba915a3ca3fc366a7159656ec0dc1 Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Mon, 6 Jan 2014 04:30:22 +0000
Subject: fix things

---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index a71bbab..f0785e5 100755
--- a/db-remove
+++ b/db-remove
@@ -33,7 +33,7 @@ for pkgbase in ${pkgbases[@]}; do
     if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
         remove_pkgs=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo ${pkgname[@]}))
 	else
-		warning "$pkgbase not found in $svnrepo"
+		warning "$pkgbase not found in ABS(libre)"
 		warning "Removing only $pkgbase from the repo"
 		warning "If it was a split package you have to remove the others yourself!"
 		remove_pkgs[${#remove_pkgs[*]}]=$pkgbase
-- 
cgit v1.2.3-2-g168b


From 39fbf0d8d3cdc666912c597d41d5b6a70fc0c725 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 20:53:38 -0500
Subject: Fix some array quoting.

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

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 1c25e5c..33d0933 100755
--- a/db-remove
+++ b/db-remove
@@ -10,7 +10,7 @@ fi
 
 repo="$1"
 arch="$2"
-pkgbases=(${@:3})
+pkgbases=("${@:3}")
 
 if ! check_repo_permission $repo; then
 	die "You don't have permission to remove packages from ${repo}"
@@ -27,7 +27,7 @@ for tarch in "${tarches[@]}"; do
 done
 
 remove_pkgs=()
-for pkgbase in ${pkgbases[@]}; do
+for pkgbase in "${pkgbases[@]}"; do
 	msg "Removing $pkgbase from [$repo]..."
 	path="$(xbs releasepath "$pkgbase" "$repo" "$arch")"
 	if [ -d "$path" ]; then
@@ -37,7 +37,7 @@ for pkgbase in ${pkgbases[@]}; do
 		warning "$pkgbase not found in XBS $repo-$arch"
 		warning "Removing only $pkgbase from the repo"
 		warning "If it was a split package you have to remove the others yourself!"
-		remove_pkgs+=($pkgbase)
+		remove_pkgs+=("$pkgbase")
 	fi
 done
 
-- 
cgit v1.2.3-2-g168b


From 0811dea8b9c695ed9e67b22d389142956bd1cdd8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 17:40:26 -0500
Subject: Fix quoting on arrays.

---
 db-remove | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index f0785e5..255aa32 100755
--- a/db-remove
+++ b/db-remove
@@ -10,24 +10,24 @@ fi
 
 repo="$1"
 arch="$2"
-pkgbases=(${@:3})
+pkgbases=("${@:3}")
 
 if ! check_repo_permission $repo; then
 	die "You don't have permission to remove packages from ${repo}"
 fi
 
 if [ "$arch" == "any" ]; then
-	tarches=(${ARCHES[@]})
+	tarches=("${ARCHES[@]}")
 else
 	tarches=("$arch")
 fi
 
-for tarch in ${tarches[@]}; do
+for tarch in "${tarches[@]}"; do
 	repo_lock $repo $tarch || exit 1
 done
 
 remove_pkgs=()
-for pkgbase in ${pkgbases[@]}; do
+for pkgbase in "${pkgbases[@]}"; do
 	msg "Removing $pkgbase from [$repo]..."
 
     if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
@@ -36,11 +36,11 @@ for pkgbase in ${pkgbases[@]}; do
 		warning "$pkgbase not found in ABS(libre)"
 		warning "Removing only $pkgbase from the repo"
 		warning "If it was a split package you have to remove the others yourself!"
-		remove_pkgs[${#remove_pkgs[*]}]=$pkgbase
+		remove_pkgs+=("$pkgbase")
 	fi
 done
 
-for tarch in ${tarches[@]}; do
-	arch_repo_remove "${repo}" "${tarch}" ${remove_pkgs[@]}
+for tarch in "${tarches[@]}"; do
+	arch_repo_remove "${repo}" "${tarch}" "${remove_pkgs[@]}"
 	repo_unlock $repo $tarch
 done
-- 
cgit v1.2.3-2-g168b


From b6e8ebd66d22abf5439485985a7851e768c71e8a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 21:04:43 -0500
Subject: Be very careful about using $0.

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

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 255aa32..4e45881 100755
--- a/db-remove
+++ b/db-remove
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-. "$(dirname $0)/db-functions"
-. "$(dirname $0)/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
+. "$(dirname "$(readlink -e "$0")")/config"
 
 if [ $# -lt 3 ]; then
-	msg "usage: $(basename $0) <repo> <arch> <pkgname|pkgbase> ..."
+	msg "usage: ${0##*/} <repo> <arch> <pkgname|pkgbase> ..."
 	exit 1
 fi
 
-- 
cgit v1.2.3-2-g168b


From 62142bcbac5f457b2172c7311741f90fedf0c776 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 15:20:16 -0500
Subject: fix comments, indentation

---
 db-remove | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 4e45881..2a12dba 100755
--- a/db-remove
+++ b/db-remove
@@ -30,8 +30,8 @@ remove_pkgs=()
 for pkgbase in "${pkgbases[@]}"; do
 	msg "Removing $pkgbase from [$repo]..."
 
-    if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
-        remove_pkgs=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo ${pkgname[@]}))
+	if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
+		remove_pkgs=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo ${pkgname[@]}))
 	else
 		warning "$pkgbase not found in ABS(libre)"
 		warning "Removing only $pkgbase from the repo"
-- 
cgit v1.2.3-2-g168b


From eefb787983d2608511214bcd682f3d8271bac60c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 16:44:51 -0500
Subject: Normalize to load config then local_config then db-functions

---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 2a12dba..46585ad 100755
--- a/db-remove
+++ b/db-remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/db-functions"
 . "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
 	msg "usage: ${0##*/} <repo> <arch> <pkgname|pkgbase> ..."
-- 
cgit v1.2.3-2-g168b


From c54e53593927e5469cfe13bacd29d25168235606 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 17 Jun 2014 23:23:31 -0400
Subject: more quoting fixes

---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 33d0933..73919be 100755
--- a/db-remove
+++ b/db-remove
@@ -31,7 +31,7 @@ for pkgbase in "${pkgbases[@]}"; do
 	msg "Removing $pkgbase from [$repo]..."
 	path="$(xbs releasepath "$pkgbase" "$repo" "$arch")"
 	if [ -d "$path" ]; then
-		remove_pkgs+=($(. "$path/PKGBUILD"; echo ${pkgname[@]}))
+		eval "remove_pkgs+=($(. "$path/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
 		xbs unrelease "$pkgbase" "$repo" "$arch"
 	else
 		warning "$pkgbase not found in XBS $repo-$arch"
-- 
cgit v1.2.3-2-g168b


From 43f8af33f08924092826e2094d15be704e842f3a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 00:32:24 -0400
Subject: more quoting and printf fixes

---
 db-remove | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 73919be..970d252 100755
--- a/db-remove
+++ b/db-remove
@@ -4,7 +4,7 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
-	msg "usage: ${0##*/} <repo> <arch> <pkgname|pkgbase> ..."
+	msg "usage: %s <repo> <arch> <pkgname|pkgbase> ..." "${0##*/}"
 	exit 1
 fi
 
@@ -12,8 +12,8 @@ repo="$1"
 arch="$2"
 pkgbases=("${@:3}")
 
-if ! check_repo_permission $repo; then
-	die "You don't have permission to remove packages from ${repo}"
+if ! check_repo_permission "$repo"; then
+	die "You don't have permission to remove packages from %s" "${repo}"
 fi
 
 if [ "$arch" == "any" ]; then
@@ -23,19 +23,19 @@ else
 fi
 
 for tarch in "${tarches[@]}"; do
-	repo_lock $repo $tarch || exit 1
+	repo_lock "$repo" "$tarch" || exit 1
 done
 
 remove_pkgs=()
 for pkgbase in "${pkgbases[@]}"; do
-	msg "Removing $pkgbase from [$repo]..."
+	msg "Removing %s from [%s]..." "$pkgbase" "$repo"
 	path="$(xbs releasepath "$pkgbase" "$repo" "$arch")"
 	if [ -d "$path" ]; then
 		eval "remove_pkgs+=($(. "$path/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
 		xbs unrelease "$pkgbase" "$repo" "$arch"
 	else
-		warning "$pkgbase not found in XBS $repo-$arch"
-		warning "Removing only $pkgbase from the repo"
+		warning "%s not found in XBS %s" "$pkgbase" "$repo-$arch"
+		warning "Removing only %s from the repo" "$pkgbase"
 		warning "If it was a split package you have to remove the others yourself!"
 		remove_pkgs+=("$pkgbase")
 	fi
@@ -43,5 +43,5 @@ done
 
 for tarch in "${tarches[@]}"; do
 	arch_repo_remove "${repo}" "${tarch}" "${remove_pkgs[@]}"
-	repo_unlock $repo $tarch
+	repo_unlock "$repo" "$tarch"
 done
-- 
cgit v1.2.3-2-g168b


From e8f411803648f64b386dd2970b024b9ba15ba682 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 11:12:18 -0400
Subject: The eval+printf %q thing wasn't worth the hard-to-read code

---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 970d252..c4439a6 100755
--- a/db-remove
+++ b/db-remove
@@ -31,7 +31,7 @@ for pkgbase in "${pkgbases[@]}"; do
 	msg "Removing %s from [%s]..." "$pkgbase" "$repo"
 	path="$(xbs releasepath "$pkgbase" "$repo" "$arch")"
 	if [ -d "$path" ]; then
-		eval "remove_pkgs+=($(. "$path/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
+		remove_pkgs+=($(. "$path/PKGBUILD"; echo "${pkgname[@]}"))
 		xbs unrelease "$pkgbase" "$repo" "$arch"
 	else
 		warning "%s not found in XBS %s" "$pkgbase" "$repo-$arch"
-- 
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-remove | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 46585ad..b0ed9bd 100755
--- a/db-remove
+++ b/db-remove
@@ -12,7 +12,7 @@ repo="$1"
 arch="$2"
 pkgbases=("${@:3}")
 
-if ! check_repo_permission $repo; then
+if ! check_repo_permission "$repo"; then
 	die "You don't have permission to remove packages from ${repo}"
 fi
 
@@ -23,7 +23,7 @@ else
 fi
 
 for tarch in "${tarches[@]}"; do
-	repo_lock $repo $tarch || exit 1
+	repo_lock "$repo" "$tarch" || exit 1
 done
 
 remove_pkgs=()
@@ -31,7 +31,7 @@ for pkgbase in "${pkgbases[@]}"; do
 	msg "Removing $pkgbase from [$repo]..."
 
 	if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
-		remove_pkgs=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo ${pkgname[@]}))
+		remove_pkgs=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo "${pkgname[@]}"))
 	else
 		warning "$pkgbase not found in ABS(libre)"
 		warning "Removing only $pkgbase from the repo"
@@ -42,5 +42,5 @@ done
 
 for tarch in "${tarches[@]}"; do
 	arch_repo_remove "${repo}" "${tarch}" "${remove_pkgs[@]}"
-	repo_unlock $repo $tarch
+	repo_unlock "$repo" "$tarch"
 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-remove | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index b0ed9bd..8fff9db 100755
--- a/db-remove
+++ b/db-remove
@@ -4,7 +4,7 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
-	msg "usage: ${0##*/} <repo> <arch> <pkgname|pkgbase> ..."
+	msg "usage: %s <repo> <arch> <pkgname|pkgbase> ..." "${0##*/}"
 	exit 1
 fi
 
@@ -13,7 +13,7 @@ arch="$2"
 pkgbases=("${@:3}")
 
 if ! check_repo_permission "$repo"; then
-	die "You don't have permission to remove packages from ${repo}"
+	die "You don't have permission to remove packages from %s" "${repo}"
 fi
 
 if [ "$arch" == "any" ]; then
@@ -28,13 +28,13 @@ done
 
 remove_pkgs=()
 for pkgbase in "${pkgbases[@]}"; do
-	msg "Removing $pkgbase from [$repo]..."
+	msg "Removing %s from [%s]..." "$pkgbase" "$repo"
 
 	if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
 		remove_pkgs=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo "${pkgname[@]}"))
 	else
-		warning "$pkgbase not found in ABS(libre)"
-		warning "Removing only $pkgbase from the repo"
+		warning "%s not found in ABS(libre)" "$pkgbase"
+		warning "Removing only %s from the repo" "$pkgbase"
 		warning "If it was a split package you have to remove the others yourself!"
 		remove_pkgs+=("$pkgbase")
 	fi
-- 
cgit v1.2.3-2-g168b


From 7efc4b2b48f9ed1669a17b3cd307db0f17e193e9 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 24 May 2015 12:32:44 -0600
Subject: db-remove: remove_pkgs= should have been remove_pkgs+=

Because of this mistake, it didn't properly handle specifying multiple
pkgbases.
---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 8fff9db..2f18ff7 100755
--- a/db-remove
+++ b/db-remove
@@ -31,7 +31,7 @@ for pkgbase in "${pkgbases[@]}"; do
 	msg "Removing %s from [%s]..." "$pkgbase" "$repo"
 
 	if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
-		remove_pkgs=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo "${pkgname[@]}"))
+		remove_pkgs+=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo "${pkgname[@]}"))
 	else
 		warning "%s not found in ABS(libre)" "$pkgbase"
 		warning "Removing only %s from the repo" "$pkgbase"
-- 
cgit v1.2.3-2-g168b


From 0be51cb3e78592984ea8152cac176448d1765fb0 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 24 May 2015 12:35:53 -0600
Subject: db-remove: pull the path ${SVNREPO}/$repo/$pkgbase into a variable.

This way, if it changes, it only needs to be changed in one place.
---
 db-remove | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index 2f18ff7..53fdb2a 100755
--- a/db-remove
+++ b/db-remove
@@ -30,8 +30,9 @@ remove_pkgs=()
 for pkgbase in "${pkgbases[@]}"; do
 	msg "Removing %s from [%s]..." "$pkgbase" "$repo"
 
-	if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
-		remove_pkgs+=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo "${pkgname[@]}"))
+	path="${SVNREPO}/$repo/$pkgbase"
+	if [ -d "$path" ]; then
+		remove_pkgs+=($(. "$path/PKGBUILD"; echo "${pkgname[@]}"))
 	else
 		warning "%s not found in ABS(libre)" "$pkgbase"
 		warning "Removing only %s from the repo" "$pkgbase"
-- 
cgit v1.2.3-2-g168b


From de1f6d3b16d6e833ec5df6e9f403aec7e2193962 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 25 May 2015 01:30:09 -0600
Subject: Use $(xbs name) instead of saying XBS.

---
 db-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index c4439a6..05b1750 100755
--- a/db-remove
+++ b/db-remove
@@ -34,7 +34,7 @@ for pkgbase in "${pkgbases[@]}"; do
 		remove_pkgs+=($(. "$path/PKGBUILD"; echo "${pkgname[@]}"))
 		xbs unrelease "$pkgbase" "$repo" "$arch"
 	else
-		warning "%s not found in XBS %s" "$pkgbase" "$repo-$arch"
+		warning "%s not found in %s for %s" "$pkgbase" "$(xbs name)" "$repo-$arch"
 		warning "Removing only %s from the repo" "$pkgbase"
 		warning "If it was a split package you have to remove the others yourself!"
 		remove_pkgs+=("$pkgbase")
-- 
cgit v1.2.3-2-g168b


From e960e11bfb0d74cf545595ebfabe4965e3a5b1ed Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 25 May 2015 01:52:20 -0600
Subject: Backport simple changes from the lukeshu/cleanup+xbs2+stuff branch

- db-move: rename dir_to to xbsrepo_to
- db-move: fix typo in comment
- db-move: add a diagnostic message
- db-remove: wrap a line
---
 db-remove | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'db-remove')

diff --git a/db-remove b/db-remove
index f761f22..dcbe4b4 100755
--- a/db-remove
+++ b/db-remove
@@ -35,7 +35,8 @@ for pkgbase in "${pkgbases[@]}"; do
 		remove_pkgs+=($(. "$path/PKGBUILD"; echo "${pkgname[@]}"))
 		xbs unrelease "$pkgbase" "$repo" "$arch"
 	else
-		warning "%s not found in %s for %s" "$pkgbase" "$(xbs name)" "$repo-$arch"
+		warning "%s not found in %s for %s" \
+			"$pkgbase" "$(xbs name)" "$repo-$arch"
 		warning "Removing only %s from the repo" "$pkgbase"
 		warning "If it was a split package you have to remove the others yourself!"
 		remove_pkgs+=("$pkgbase")
-- 
cgit v1.2.3-2-g168b