From 9fba20c1e3a70d5cb6e2a7f59d026ce3e28185e2 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@parabola.nu>
Date: Tue, 30 Apr 2013 14:11:10 -0300
Subject: Removed svn, should work with regular abs

---
 db-move | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 019faa2..010d941 100755
--- a/db-move
+++ b/db-move
@@ -24,12 +24,10 @@ for pkgarch in ${ARCHES[@]}; do
 	repo_lock ${repo_from} ${pkgarch} || exit 1
 done
 
-# check if packages to be moved exist in svn and ftp dir
-/usr/bin/svn checkout -q -N "${SVNREPO}" "${WORKDIR}/svn" >/dev/null
+# No idea why we loop twice... -- fauno
 for pkgbase in ${args[@]:2}; do
-	/usr/bin/svn up -q "${WORKDIR}/svn/${pkgbase}" >/dev/null
 	for pkgarch in ${ARCHES[@]} 'any'; do
-		svnrepo_from="${WORKDIR}/svn/${pkgbase}/repos/${repo_from}-${pkgarch}"
+		svnrepo_from="${SVNREPO}/${repo_from}/${pkgbase}"
 		if [ -r "${svnrepo_from}/PKGBUILD" ]; then
 			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
 			if [ ${#pkgnames[@]} -lt 1 ]; then
@@ -64,8 +62,7 @@ declare -A add_pkgs
 declare -A remove_pkgs
 for pkgbase in ${args[@]:2}; do
 	for pkgarch in ${ARCHES[@]} 'any'; do
-		svnrepo_from="${WORKDIR}/svn/${pkgbase}/repos/${repo_from}-${pkgarch}"
-		svnrepo_to="${WORKDIR}/svn/${pkgbase}/repos/${repo_to}-${pkgarch}"
+		svnrepo_from="${SVNREPO}/${repo_from}/${pkgbase}"
 
 		if [ -f "${svnrepo_from}/PKGBUILD" ]; then
 			if [ "${pkgarch}" == 'any' ]; then
@@ -77,21 +74,6 @@ for pkgbase in ${args[@]:2}; do
 			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
 			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
 
-			if [ -d "${svnrepo_to}" ]; then
-				for file in $(/usr/bin/svn ls "${svnrepo_to}"); do
-					/usr/bin/svn rm -q "${svnrepo_to}/$file"
-				done
-			else
-				mkdir "${svnrepo_to}"
-				/usr/bin/svn add -q "${svnrepo_to}"
-			fi
-
-			for file in $(svn ls "${svnrepo_from}"); do
-				/usr/bin/svn mv -q -r HEAD "${svnrepo_from}/$file" "${svnrepo_to}/"
-			done
-			/usr/bin/svn rm --force -q "${svnrepo_from}"
-			/usr/bin/svn commit -q "${WORKDIR}/svn/${pkgbase}" -m "$(basename $0): moved ${pkgbase} from [${repo_from}] to [${repo_to}] (${pkgarch})"
-
 			for pkgname in ${pkgnames[@]}; do
 				for tarch in ${tarches[@]}; do
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT})
-- 
cgit v1.2.3-54-g00ecf


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

---
 config                |  2 --
 cron-jobs/sourceballs |  4 ++--
 db-functions          | 49 +++++++++++--------------------------------------
 db-move               | 48 ++++++++++++++----------------------------------
 db-remove             | 15 +++++----------
 db-update             |  4 ++--
 test/lib/common.inc   | 15 ++++++++++++++-
 testing2x             | 10 ++++------
 8 files changed, 52 insertions(+), 95 deletions(-)

(limited to 'db-move')

diff --git a/config b/config
index 3df6c95..e1e705b 100644
--- a/config
+++ b/config
@@ -1,6 +1,4 @@
 FTP_BASE="/srv/ftp"
-SVNREPO=''
-SVNUSER=''
 PKGREPOS=()
 PKGPOOL=''
 SRCPOOL=''
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 6f75ccc..9572a30 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -77,9 +77,9 @@ for repo in ${PKGREPOS[@]}; do
 				continue
 			fi
 
-			# Get the sources from svn
+			# Get the sources from xbs
 			mkdir -p -m0770 "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}"
-			arch_svn export -q "${SVNREPO}/${pkgbase}/repos/${repo}-${pkgarch}" \
+			cp -a "$(xbs releasepath "${pkgbase}" "${repo}" "${pkgarch}")" \
 				"${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1
 			if [ $? -ge 1 ]; then
 				failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
diff --git a/db-functions b/db-functions
index 523e872..c98b26f 100644
--- a/db-functions
+++ b/db-functions
@@ -17,11 +17,6 @@ restore_umask () {
 
 # set up general environment
 WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX")
-if [ -n "${SVNUSER}" ]; then
-	setfacl -m u:"${SVNUSER}":rwx "${WORKDIR}"
-	setfacl -m d:u:"${USER}":rwx "${WORKDIR}"
-	setfacl -m d:u:"${SVNUSER}":rwx "${WORKDIR}"
-fi
 LOCKS=()
 
 # Used: plain, msg, msg2, warning, error, in_array
@@ -292,7 +287,7 @@ check_pkgfile() {
 	fi
 }
 
-check_pkgsvn() {
+check_pkgxbs() {
 	local pkgfile="${1}"
 	local _pkgbase="$(getpkgbase ${pkgfile})"
 	[ $? -ge 1 ] && return 1
@@ -306,18 +301,11 @@ check_pkgsvn() {
 
 	in_array "${repo}" ${PKGREPOS[@]} || return 1
 
-	if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
-		mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
-		arch_svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \
-			"${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null
-		[ $? -ge 1 ] && return 1
-	fi
-
-	local svnver="$(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}) )"
-	[ "${svnver}" == "${_pkgver}" ] || return 1
+	local xbsver="$(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}) )"
+	[ "${xbsver}" == "${_pkgver}" ] || return 1
 
-	local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo ${pkgname[@]}))
-	in_array "${_pkgname}" ${svnnames[@]} || return 1
+	local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo ${pkgname[@]}))
+	in_array "${_pkgname}" ${xbsnames[@]} || return 1
 
 	return 0
 }
@@ -328,7 +316,7 @@ check_splitpkgs() {
 	local pkgfiles=(${@})
 	local pkgfile
 	local pkgdir
-	local svnname
+	local xbsname
 
 	mkdir -p "${WORKDIR}/check_splitpkgs/"
 	pushd "${WORKDIR}/check_splitpkgs" >/dev/null
@@ -341,16 +329,9 @@ check_splitpkgs() {
 		mkdir -p "${repo}/${_pkgarch}/${_pkgbase}"
 		echo "${_pkgname}" >> "${repo}/${_pkgarch}/${_pkgbase}/staging"
 
-		if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
-			mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
-			arch_svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \
-				"${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null
-			[ $? -ge 1 ] && return 1
-		fi
-
-		local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo ${pkgname[@]}))
-		for svnname in ${svnnames[@]}; do
-			echo "${svnname}" >> "${repo}/${_pkgarch}/${_pkgbase}/svn"
+		local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo ${pkgname[@]}))
+		for xbsname in ${xbsnames[@]}; do
+			echo "${xbsname}" >> "${repo}/${_pkgarch}/${_pkgbase}/xbs"
 		done
 	done
 	popd >/dev/null
@@ -358,8 +339,8 @@ check_splitpkgs() {
 	for pkgdir in "${WORKDIR}/check_splitpkgs/${repo}"/*/*; do
 		[ ! -d "${pkgdir}" ] && continue
 		sort -u "${pkgdir}/staging" -o "${pkgdir}/staging"
-		sort -u "${pkgdir}/svn" -o "${pkgdir}/svn"
-		if [ ! -z "$(comm -13 "${pkgdir}/staging" "${pkgdir}/svn")" ]; then
+		sort -u "${pkgdir}/xbs" -o "${pkgdir}/xbs"
+		if [ ! -z "$(comm -13 "${pkgdir}/staging" "${pkgdir}/xbs")" ]; then
 			return 1
 		fi
 	done
@@ -465,11 +446,3 @@ arch_repo_remove() {
 		|| error "repo-remove ${filesfile} ${pkgs[@]}"
 	set_repo_permission "${repo}" "${arch}"
 }
-
-arch_svn() {
-	if [ -z "${SVNUSER}" ]; then
-		/usr/bin/svn "${@}"
-	else
-		sudo -u "${SVNUSER}" -- /usr/bin/svn --username "${USER}" "${@}"
-	fi
-}
diff --git a/db-move b/db-move
index 1fa44d4..045f33c 100755
--- a/db-move
+++ b/db-move
@@ -24,19 +24,17 @@ for pkgarch in ${ARCHES[@]}; do
 	repo_lock ${repo_from} ${pkgarch} || exit 1
 done
 
-# check if packages to be moved exist in svn and ftp dir
-arch_svn checkout -q -N "${SVNREPO}" "${WORKDIR}/svn" >/dev/null
+# check if packages to be moved exist in xbs and ftp dir
 for pkgbase in ${args[@]:2}; do
-	arch_svn up -q "${WORKDIR}/svn/${pkgbase}" >/dev/null
 	for pkgarch in ${ARCHES[@]} 'any'; do
-		svnrepo_from="${WORKDIR}/svn/${pkgbase}/repos/${repo_from}-${pkgarch}"
-		if [ -r "${svnrepo_from}/PKGBUILD" ]; then
-			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
+		xbsrepo_from="$(xbs releasepath ${pkgbase} ${repo_from} ${pkgarch})"
+		if [ -r "${xbsrepo_from}/PKGBUILD" ]; then
+			pkgnames=($(. "${xbsrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
 			if [ ${#pkgnames[@]} -lt 1 ]; then
 				die "Could not read pkgname"
 			fi
 
-			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
+			pkgver=$(. "${xbsrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
 			if [ -z "${pkgver}" ]; then
 				die "Could not read pkgver"
 			fi
@@ -63,35 +61,19 @@ msg "Moving packages from [${repo_from}] to [${repo_to}]..."
 declare -A add_pkgs
 declare -A remove_pkgs
 for pkgbase in ${args[@]:2}; do
-	tag_list=""
-	for pkgarch in ${ARCHES[@]} 'any'; do
-		svnrepo_from="${WORKDIR}/svn/${pkgbase}/repos/${repo_from}-${pkgarch}"
-		svnrepo_to="${WORKDIR}/svn/${pkgbase}/repos/${repo_to}-${pkgarch}"
-
-		if [ -f "${svnrepo_from}/PKGBUILD" ]; then
+	# move the package in xbs
+	arches=($(xbs move ${repo_from} ${repo_to} ${pkgbase}))
+	# move the package in ftp
+	for pkgarch in ${arches[@]}; do
+		dir_to="$(xbs releasepath $pkgbase $repo_to $pkgarch)"
+		if true; then # to add in indent level to make merging easier
 			if [ "${pkgarch}" == 'any' ]; then
-				tarches=(${ARCHES[@]})
+				tarches=("${ARCHES[@]}")
 			else
 				tarches=("${pkgarch}")
 			fi
-			msg2 "${pkgbase} ($(echo ${tarches[@]}))"
-			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
-			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
-
-			if [ -d "${svnrepo_to}" ]; then
-				for file in $(arch_svn ls "${svnrepo_to}"); do
-					arch_svn rm -q "${svnrepo_to}/$file@"
-				done
-			else
-				mkdir "${svnrepo_to}"
-				arch_svn add -q "${svnrepo_to}"
-			fi
-
-			for file in $(arch_svn ls "${svnrepo_from}"); do
-				arch_svn mv -q -r HEAD "${svnrepo_from}/$file@" "${svnrepo_to}/"
-			done
-			arch_svn rm --force -q "${svnrepo_from}"
-			tag_list="$tag_list, $pkgarch"
+			pkgnames=($(. "${dir_to}/PKGBUILD"; echo ${pkgname[@]}))
+			pkgver=$(. "${dir_to}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
 
 			for pkgname in ${pkgnames[@]}; do
 				for tarch in ${tarches[@]}; do
@@ -108,8 +90,6 @@ for pkgbase in ${args[@]:2}; do
 			done
 		fi
 	done
-	tag_list="${tag_list#, }"
-	arch_svn commit -q "${WORKDIR}/svn/${pkgbase}" -m "${0##*/}: moved ${pkgbase} from [${repo_from}] to [${repo_to}] (${tag_list})"
 done
 
 for tarch in ${ARCHES[@]}; do
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
diff --git a/db-update b/db-update
index 576fe2b..28fcabe 100755
--- a/db-update
+++ b/db-update
@@ -45,8 +45,8 @@ for repo in ${repos[@]}; do
 			if ${REQUIRE_SIGNATURE} && ! pacman-key -v "${pkg}.sig" >/dev/null 2>&1; then
 				die "Package ${repo}/${pkg##*/} does not have a valid signature"
 			fi
-			if ! check_pkgsvn "${pkg}" "${repo}"; then
-				die "Package ${repo}/${pkg##*/} is not consistent with svn repository"
+			if ! check_pkgxbs "${pkg}" "${repo}"; then
+				die "Package ${repo}/${pkg##*/} is not consistent with xbs"
 			fi
 			if ! check_pkgrepos "${pkg}"; then
 				die "Package ${repo}/${pkg##*/} already exists in another repository"
diff --git a/test/lib/common.inc b/test/lib/common.inc
index fbdd30b..396f12f 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -19,6 +19,10 @@ arches() (
 	printf '%s\n' "${ARCHES[*]}"
 )
 
+arch_svn() {
+	/usr/bin/svn "$@"
+}
+
 signpkg() {
 	if [[ -r '/etc/makepkg.conf' ]]; then
 		source '/etc/makepkg.conf'
@@ -120,6 +124,15 @@ setUp() {
 		arch_svn commit -q -m"initial commit of ${pkg}" "${TMP}/svn-packages-copy"
 	done
 
+	mkdir -p "${TMP}/home/.config/libretools"
+	export XDG_CONFIG_HOME="${TMP}/home/.config"
+	printf '%s\n' \
+		'SVNURL=foo' \
+		"SVNREPO=\"${TMP}/svn-packages-copy\"" \
+		"ARCHES=($(arches))" \
+		> $XDG_CONFIG_HOME/libretools/xbs-abs.conf
+	printf '%s\n' 'BUILDSYSTEM=abs' > $XDG_CONFIG_HOME/xbs.conf
+
 	cat <<eot > "$(dirname ${BASH_SOURCE[0]})/../../config.local"
 	FTP_BASE="${TMP}/ftp"
 	SVNREPO="${TMP}/svn-packages-copy"
@@ -155,7 +168,7 @@ releasePackage() {
 	local pkgname
 
 	pushd "${TMP}/svn-packages-copy"/${pkgbase}/trunk/ >/dev/null
-	archrelease ${repo}-${arch} >/dev/null 2>&1
+	xbs release ${repo} ${arch} >/dev/null 2>&1
 	pkgver=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
 	pkgname=($(. PKGBUILD; echo ${pkgname[@]}))
 	popd >/dev/null
diff --git a/testing2x b/testing2x
index 369857f..a76e972 100755
--- a/testing2x
+++ b/testing2x
@@ -20,12 +20,10 @@ declare -A pkgs
 
 for pkgbase in $*; do
 	if [ ! -d "${WORKDIR}/${pkgbase}" ]; then
-		arch_svn export -q "${SVNREPO}/${pkgbase}/repos" "${WORKDIR}/${pkgbase}" >/dev/null
-
 		found_source=false
 		for pkgarch in ${ARCHES[@]} 'any'; do
-			svnrepo_from="${WORKDIR}/${pkgbase}/${TESTING_REPO}-${pkgarch}"
-			if [ -r "${svnrepo_from}/PKGBUILD" ]; then
+			xbsrepo_from="$(xbs releasepath ${pkgbase} ${TESTING_REPO} ${pkgarch})"
+			if [ -r "${xbsrepo_from}/PKGBUILD" ]; then
 				found_source=true
 				break
 			fi
@@ -34,8 +32,8 @@ for pkgbase in $*; do
 		found_target=false
 		for pkgarch in ${ARCHES[@]} 'any'; do
 			for repo in ${STABLE_REPOS[@]}; do
-				svnrepo_to="${WORKDIR}/${pkgbase}/${repo}-${pkgarch}"
-				if [ -r "${svnrepo_to}/PKGBUILD" ]; then
+				xbsrepo_to="$(xbs releasepath ${pkgbase} ${repo} ${pkgarch})"
+				if [ -r "${xbsrepo_to}/PKGBUILD" ]; then
 					found_target=true
 					pkgs[${repo}]+="${pkgbase} "
 					break 2
-- 
cgit v1.2.3-54-g00ecf


From 7034eed1f7ceec379b34f8dd782fb986c7165ad4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 29 Jun 2013 00:45:43 -0600
Subject: use the get_full_version from libremessages (actually, common.sh)

It works properly when split packages have different versions.
---
 db-functions        | 20 +++-----------------
 db-move             | 10 +++++-----
 test/lib/common.inc |  4 ++--
 3 files changed, 10 insertions(+), 24 deletions(-)

(limited to 'db-move')

diff --git a/db-functions b/db-functions
index dabb22b..f5e2b3d 100644
--- a/db-functions
+++ b/db-functions
@@ -19,27 +19,13 @@ restore_umask () {
 WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX")
 LOCKS=()
 
-# Used: plain, msg, msg2, warning, error, in_array
-# Overwritten: get_full_version,
-#              cleanup, abort, die
+# Used: plain, msg, msg2, warning, error, in_array, get_full_version
+# Overwritten: cleanup, abort, die
 # Ignored: stat_busy, stat_done,
 #          setup_workdir, trab_abort, trap_exit,
 #          lock, slock, lock_close
 . $(librelib common)
 
-##
-#  usage : get_full_version( $epoch, $pkgver, $pkgrel )
-# return : full version spec, including epoch (if necessary), pkgver, pkgrel
-##
-get_full_version() {
-	if [[ $1 -eq 0 ]]; then
-		# zero epoch case, don't include it in version
-		echo $2-$3
-	else
-		echo $1:$2-$3
-	fi
-}
-
 script_lock() {
 	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
@@ -301,7 +287,7 @@ check_pkgxbs() {
 
 	in_array "${repo}" ${PKGREPOS[@]} || return 1
 
-	local xbsver="$(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}) )"
+	local xbsver="$(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; get_full_version "${_pkgname}")"
 	[ "${xbsver}" == "${_pkgver}" ] || return 1
 
 	local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo ${pkgname[@]}))
diff --git a/db-move b/db-move
index 045f33c..6e8796d 100755
--- a/db-move
+++ b/db-move
@@ -34,10 +34,6 @@ for pkgbase in ${args[@]:2}; do
 				die "Could not read pkgname"
 			fi
 
-			pkgver=$(. "${xbsrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
-			if [ -z "${pkgver}" ]; then
-				die "Could not read pkgver"
-			fi
 
 			if [ "${pkgarch}" == 'any' ]; then
 				tarches=(${ARCHES[@]})
@@ -46,6 +42,10 @@ for pkgbase in ${args[@]:2}; do
 			fi
 
 			for pkgname in ${pkgnames[@]}; do
+				pkgver=$(. "${xbsrepo_from}/PKGBUILD"; get_full_version ${pkgname})
+				if [ -z "${pkgver}" ]; then
+					die "Could not read pkgver"
+				fi
 				for tarch in ${tarches[@]}; do
 					getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT} >/dev/null
 				done
@@ -73,9 +73,9 @@ for pkgbase in ${args[@]:2}; do
 				tarches=("${pkgarch}")
 			fi
 			pkgnames=($(. "${dir_to}/PKGBUILD"; echo ${pkgname[@]}))
-			pkgver=$(. "${dir_to}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
 
 			for pkgname in ${pkgnames[@]}; do
+				pkgver=$(. "${dir_to}/PKGBUILD"; get_full_version ${pkgname})
 				for tarch in ${tarches[@]}; do
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT})
 					pkgfile="${pkgpath##*/}"
diff --git a/test/lib/common.inc b/test/lib/common.inc
index 396f12f..2f308dd 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -54,7 +54,7 @@ oneTimeSetUp() {
 		pushd $d >/dev/null
 		pkgname=($(. PKGBUILD; echo ${pkgname[@]}))
 		pkgarch=($(. PKGBUILD; echo ${arch[@]}))
-		pkgversion=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
+		pkgversion=$(. PKGBUILD; get_full_version)
 
 		build=true
 		for a in ${pkgarch[@]}; do
@@ -169,7 +169,7 @@ releasePackage() {
 
 	pushd "${TMP}/svn-packages-copy"/${pkgbase}/trunk/ >/dev/null
 	xbs release ${repo} ${arch} >/dev/null 2>&1
-	pkgver=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
+	pkgver=$(. PKGBUILD; get_full_version)
 	pkgname=($(. PKGBUILD; echo ${pkgname[@]}))
 	popd >/dev/null
 	cp "${pkgdir}/${pkgbase}"/*-${pkgver}-${arch}${PKGEXT} "${STAGING}"/${repo}/
-- 
cgit v1.2.3-54-g00ecf


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

---
 cron-jobs/ftpdir-cleanup | 4 ++--
 cron-jobs/sourceballs    | 2 +-
 cron-jobs/update-web-db  | 4 ++--
 db-move                  | 4 ++--
 db-remove                | 4 ++--
 db-repo-add              | 4 ++--
 db-repo-remove           | 4 ++--
 db-update                | 4 ++--
 testing2x                | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'db-move')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 8f5cb3c..e42a1a8 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/../config"
-. "$(dirname $0)/../db-functions"
+. "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 clean_pkg() {
 	local pkg
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 103898d..2362024 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dirname="$(dirname $(readlink -e $0))"
+dirname="$(dirname "$(readlink -e "$0")")"
 . "${dirname}/../config"
 . "${dirname}/../db-functions"
 pushd "${WORKDIR}" >/dev/null
diff --git a/cron-jobs/update-web-db b/cron-jobs/update-web-db
index 195d1fc..713e75e 100755
--- a/cron-jobs/update-web-db
+++ b/cron-jobs/update-web-db
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/../config"
-. "$(dirname $0)/../db-functions"
+. "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 # setup paths
 SPATH="/srv/http/archweb"
diff --git a/db-move b/db-move
index 6e8796d..1b34404 100755
--- a/db-move
+++ b/db-move
@@ -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-from> <repo-to> <pkgname|pkgbase> ..."
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> ..."
diff --git a/db-repo-add b/db-repo-add
index 5d5b653..a6355a1 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -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> <pkgfile> ..."
diff --git a/db-repo-remove b/db-repo-remove
index 2a693f4..7077d62 100755
--- a/db-repo-remove
+++ b/db-repo-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> ..."
diff --git a/db-update b/db-update
index 28fcabe..9c6a56a 100755
--- a/db-update
+++ b/db-update
@@ -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 [ $# -ge 1 ]; then
 	warning "Calling ${0##*/} with a specific repository is no longer supported"
diff --git a/testing2x b/testing2x
index d93c5f8..14610c2 100755
--- a/testing2x
+++ b/testing2x
@@ -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 1 ]; then
 	msg "usage: ${0##*/} <pkgname|pkgbase> ..."
-- 
cgit v1.2.3-54-g00ecf


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.

---
 create-repo                                  |  4 ++--
 cron-jobs/check_archlinux/parse_pkgbuilds.sh | 22 ++++++++++----------
 cron-jobs/ftpdir-cleanup                     | 12 +++++------
 cron-jobs/repo-sanity-check                  |  4 ++--
 cron-jobs/sourceballs                        | 26 ++++++++++++------------
 cron-jobs/sourceballs2                       |  4 ++--
 db-check-nonfree                             | 22 ++++++++++----------
 db-functions                                 | 30 ++++++++++++++--------------
 db-list-unsigned-packages                    |  2 +-
 db-move                                      | 27 ++++++++++++-------------
 db-remove                                    |  6 +++---
 db-sync                                      |  5 ++---
 db-update                                    | 26 ++++++++++++------------
 get-repos                                    |  6 +++---
 repo-restore-to-normal                       |  6 +++---
 15 files changed, 100 insertions(+), 102 deletions(-)

(limited to 'db-move')

diff --git a/create-repo b/create-repo
index 21a2a9c..1ec9798 100755
--- a/create-repo
+++ b/create-repo
@@ -10,12 +10,12 @@ if [ $# -eq 0 ]; then
 fi
 
 msg "Creating repos..."
-for _repo in $@; do
+for _repo in "$@"; do
     msg2 "Creating [${_repo}]"
     mkdir -p "${FTP_BASE}/staging/${_repo}" || \
         error "Failed creating staging dir"
 
-    for _arch in ${ARCHES[@]}; do
+    for _arch in "${ARCHES[@]}"; do
         mkdir -p "${FTP_BASE}/${_repo}/os/${_arch}" || \
             error "Failed creating ${_arch} dir"
     done
diff --git a/cron-jobs/check_archlinux/parse_pkgbuilds.sh b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
index 3f92169..c8d8618 100755
--- a/cron-jobs/check_archlinux/parse_pkgbuilds.sh
+++ b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
@@ -6,18 +6,18 @@
 exit() { return; }
 
 splitpkg_overrides=('depends' 'optdepends' 'provides' 'conflicts')
-variables=('pkgname' 'pkgbase' 'epoch' 'pkgver' 'pkgrel' 'makedepends' 'arch' ${splitpkg_overrides[@]})
+variables=('pkgname' 'pkgbase' 'epoch' 'pkgver' 'pkgrel' 'makedepends' 'arch' "${splitpkg_overrides[@]}")
 readonly -a variables splitpkg_overrides
 
 backup_package_variables() {
-	for var in ${splitpkg_overrides[@]}; do
+	for var in "${splitpkg_overrides[@]}"; do
 		indirect="${var}_backup"
 		eval "${indirect}=(\${$var[@]})"
 	done
 }
 
 restore_package_variables() {
-	for var in ${splitpkg_overrides[@]}; do
+	for var in "${splitpkg_overrides[@]}"; do
 		indirect="${var}_backup"
 		if [ -n "${!indirect}" ]; then
 			eval "${var}=(\${$indirect[@]})"
@@ -42,31 +42,31 @@ print_info() {
 
 	if [ -n "$arch" ]; then
 		echo "%ARCH%"
-		for i in ${arch[@]}; do echo $i; done
+		for i in "${arch[@]}"; do echo $i; done
 		echo ""
 	fi
 	if [ -n "$depends" ]; then
 		echo "%DEPENDS%"
-		for i in ${depends[@]}; do
+		for i in "${depends[@]}"; do
 			echo $i
 		done
 		echo ""
 	fi
 	if [ -n "$makedepends" ]; then
 		echo "%MAKEDEPENDS%"
-		for i in ${makedepends[@]}; do
+		for i in "${makedepends[@]}"; do
 			echo $i
 		done
 		echo ""
 	fi
 	if [ -n "$conflicts" ]; then
 		echo "%CONFLICTS%"
-		for i in ${conflicts[@]}; do echo $i; done
+		for i in "${conflicts[@]}"; do echo $i; done
 		echo ""
 	fi
 	if [ -n "$provides" ]; then
 		echo "%PROVIDES%"
-		for i in ${provides[@]}; do echo $i; done
+		for i in "${provides[@]}"; do echo $i; done
 		echo ""
 	fi
 }
@@ -75,7 +75,7 @@ source_pkgbuild() {
 	ret=0
 	dir=$1
 	pkgbuild=$dir/PKGBUILD
-	for var in ${variables[@]}; do
+	for var in "${variables[@]}"; do
 		unset ${var}
 	done
 	source $pkgbuild &>/dev/null || ret=$?
@@ -88,7 +88,7 @@ source_pkgbuild() {
 
 	if [ "${#pkgname[@]}" -gt "1" ]; then
 		pkgbase=${pkgbase:-${pkgname[0]}}
-		for pkg in ${pkgname[@]}; do
+		for pkg in "${pkgname[@]}"; do
 			if [ "$(type -t package_${pkg})" != "function" ]; then
 				echo -e "%INVALID%\n$pkgbuild\n"
 				return 1
@@ -98,7 +98,7 @@ source_pkgbuild() {
 				while IFS= read -r line; do
 					var=${line%%=*}
 					var="${var#"${var%%[![:space:]]*}"}"   # remove leading whitespace characters
-					for realvar in ${variables[@]}; do
+					for realvar in "${variables[@]}"; do
 						if [ "$var" == "$realvar" ]; then
 							eval $line
 							break
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index e42a1a8..ad2e7f9 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -24,16 +24,16 @@ clean_pkg() {
 
 script_lock
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_lock ${repo} ${arch} || exit 1
 	done
 done
 
 ${CLEANUP_DRYRUN} && warning 'dry run mode is active'
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
 		fi
@@ -87,8 +87,8 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	done
 fi
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${arch}
 	done
 done
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index ee4c061..9d351df 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -5,7 +5,7 @@
 . "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 # Traverse all repos
-for _repo in ${PKGREPOS[@]}; do
+for _repo in "${PKGREPOS[@]}"; do
     msg "Cleaning up [${_repo}]"
 
 # Find all pkgnames on this repo's abs
@@ -19,7 +19,7 @@ for _repo in ${PKGREPOS[@]}; do
                   >/dev/null 2>&1
 
 # also cleanup package functions
-            for _pkg in ${pkgname[@]}; do
+            for _pkg in "${pkgname[@]}"; do
                 unset package_${pkg} >/dev/null 2>&1
             done
             
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 1542499..329e135 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -7,8 +7,8 @@ pushd "${WORKDIR}" >/dev/null
 
 script_lock
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_lock ${repo} ${arch} || exit 1
 	done
 done
@@ -18,8 +18,8 @@ renice +10 -p $$ > /dev/null
 
 # Create a readable file for each repo with the following format
 # <pkgbase|pkgname> <pkgver>-<pkgrel> <arch> <license>[ <license>]
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		# Repo does not exist; skip it
 		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
@@ -39,8 +39,8 @@ for repo in ${PKGREPOS[@]}; do
 	done | sort -u > "${WORKDIR}/db-${repo}"
 done
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${arch}
 	done
 done
@@ -49,15 +49,15 @@ done
 find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
 
 # Check for all packages if we need to build a source package
-for repo in ${PKGREPOS[@]}; do
+for repo in "${PKGREPOS[@]}"; do
 	newpkgs=()
 	failedpkgs=()
 	while read line; do
-		pkginfo=(${line})
+		pkginfo=("${line}")
 		pkgbase=${pkginfo[0]}
 		pkgver=${pkginfo[1]}
 		pkgarch=${pkginfo[2]}
-		pkglicense=(${pkginfo[@]:3})
+		pkglicense=("${pkginfo[@]:3}")
 
 		# Should this package be skipped?
 		if grep -Fqx "${pkgbase}" "${dirname}/sourceballs.skip"; then
@@ -105,13 +105,13 @@ for repo in ${PKGREPOS[@]}; do
 
 	if [ ${#newpkgs[@]} -ge 1 ]; then
 		msg "Adding source packages for [${repo}]..."
-		for new_pkg in ${newpkgs[@]}; do
+		for new_pkg in "${newpkgs[@]}"; do
 			msg2 "${new_pkg}"
 		done
 	fi
 	if [ ${#failedpkgs[@]} -ge 1 ]; then
 		msg "Failed to create source packages for [${repo}]..."
-		for failed_pkg in ${failedpkgs[@]}; do
+		for failed_pkg in "${failedpkgs[@]}"; do
 			msg2 "${failed_pkg}"
 		done
 	fi
@@ -125,7 +125,7 @@ old_pkgs=($(comm -23 "${WORKDIR}/available-src-pkgs.sort" "${WORKDIR}/expected-s
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old source packages..."
 	${SOURCE_CLEANUP_DRYRUN} && warning 'dry run mode is active'
-	for old_pkg in ${old_pkgs[@]}; do
+	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 "${old_pkg}"
 		if ! ${SOURCE_CLEANUP_DRYRUN}; then
 			mv_acl "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
@@ -137,7 +137,7 @@ fi
 old_pkgs=($(find ${SOURCE_CLEANUP_DESTDIR} -type f -name "*${SRCEXT}" -mtime +${SOURCE_CLEANUP_KEEP} -printf '%f\n'))
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old source packages from the cleanup directory..."
-	for old_pkg in ${old_pkgs[@]}; do
+	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 "${old_pkg}"
 		${SOURCE_CLEANUP_DRYRUN} || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 	done
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index 1432bdf..2a26e6a 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -21,7 +21,7 @@ find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort
 
 pushd "${SVNREPO}" >/dev/null
 
-for repo in ${PKGREPOS[@]}; do
+for repo in "${PKGREPOS[@]}"; do
     msg "Sourceballing [${repo}]"
 
     pushd $repo >/dev/null
@@ -40,7 +40,7 @@ for repo in ${PKGREPOS[@]}; do
         unset build package url pkgdesc source md5sums depends makedepends \
               optdepends license arch options check mksource
 
-        for _pkg in ${pkgname[@]}; do
+        for _pkg in "${pkgname[@]}"; do
             unset package_${_pkg} >/dev/null 2>&1
         done
 
diff --git a/db-check-nonfree b/db-check-nonfree
index 5cb7f6f..6e2dc17 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -9,16 +9,16 @@ if [ $# -ge 1 ]; then
 fi
 
 # TODO: this might lock too much (architectures)
-for repo in ${repos[@]}; do
-	for pkgarch in ${ARCHES[@]}; do
+for repo in "${repos[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
 		repo_lock ${repo} ${pkgarch} || exit 1
 	done
 done
 
 msg "Check nonfree in repo:"
 nonfree=($(cut -d: -f1 ${BLACKLIST_FILE} | sort -u))
-for repo in ${ARCHREPOS[@]}; do
-    for pkgarch in ${ARCHES[@]}; do
+for repo in "${ARCHREPOS[@]}"; do
+    for pkgarch in "${ARCHES[@]}"; do
 	msg2 "$repo $pkgarch"
 	if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then
 	    continue
@@ -27,20 +27,20 @@ for repo in ${ARCHREPOS[@]}; do
 	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})
+	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[@]}
+        msg2 "Nonfree: ${cleanpkgs[*]}"
+	    arch_repo_remove "${repo}" "${pkgarch}" "${cleanpkgs[@]}"
 	fi
     done
 done
 
-for repo in ${repos[@]}; do
-	for pkgarch in ${ARCHES[@]}; do
+for repo in "${repos[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${pkgarch}
 	done
 done
diff --git a/db-functions b/db-functions
index efb6172..5b10e05 100644
--- a/db-functions
+++ b/db-functions
@@ -67,7 +67,7 @@ cleanup() {
 	local arch
 
 	trap - EXIT INT QUIT TERM
-	for l in ${LOCKS[@]}; do
+	for l in "${LOCKS[@]}"; do
 		repo=${l%.*}
 		arch=${l#*.}
 		if [ -d "$TMPDIR/.repolock.$repo.$arch" ]; then
@@ -256,7 +256,7 @@ getpkgfiles() {
 		exit 1
 	fi
 
-	for f in ${@}; do
+	for f in "${@}"; do
 		if  [ ! -f "${f}" ]; then
 			error "Package ${f} not found!"
 			exit 1
@@ -266,7 +266,7 @@ getpkgfiles() {
 		fi
 	done
 
-	echo ${@}
+	echo "${@}"
 }
 
 check_pkgfile() {
@@ -279,7 +279,7 @@ check_pkgfile() {
 	local pkgarch="$(getpkgarch ${pkgfile})"
 	[ $? -ge 1 ] && return 1
 
-	in_array "${pkgarch}" ${ARCHES[@]} 'any' || return 1
+	in_array "${pkgarch}" "${ARCHES[@]}" 'any' || return 1
 
 	if echo "${pkgfile##*/}" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then
 		return 0
@@ -300,13 +300,13 @@ check_pkgxbs() {
 	[ $? -ge 1 ] && return 1
 	local repo="${2}"
 
-	in_array "${repo}" ${PKGREPOS[@]} || return 1
+	in_array "${repo}" "${PKGREPOS[@]}" || return 1
 
 	local xbsver="$(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; get_full_version "${_pkgname}")"
 	[ "${xbsver}" == "${_pkgver}" ] || return 1
 
 	local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo ${pkgname[@]}))
-	in_array "${_pkgname}" ${xbsnames[@]} || return 1
+	in_array "${_pkgname}" "${xbsnames[@]}" || return 1
 
 	return 0
 }
@@ -314,7 +314,7 @@ check_pkgxbs() {
 check_splitpkgs() {
 	local repo="${1}"
 	shift
-	local pkgfiles=(${@})
+	local pkgfiles=("${@}")
 	local pkgfile
 	local pkgdir
 	local xbsname
@@ -322,7 +322,7 @@ check_splitpkgs() {
 	mkdir -p "${WORKDIR}/check_splitpkgs/"
 	pushd "${WORKDIR}/check_splitpkgs" >/dev/null
 
-	for pkgfile in ${pkgfiles[@]}; do
+	for pkgfile in "${pkgfiles[@]}"; do
 		issplitpkg "${pkgfile}" || continue
 		local _pkgbase="$(getpkgbase ${pkgfile})"
 		msg2 "Checking %s" "$_pkgbase"
@@ -332,7 +332,7 @@ check_splitpkgs() {
 		echo "${_pkgname}" >> "${repo}/${_pkgarch}/${_pkgbase}/staging"
 
 		local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo ${pkgname[@]}))
-		for xbsname in ${xbsnames[@]}; do
+		for xbsname in "${xbsnames[@]}"; do
 			echo "${xbsname}" >> "${repo}/${_pkgarch}/${_pkgbase}/xbs"
 		done
 	done
@@ -419,13 +419,13 @@ set_repo_permission() {
 arch_repo_add() {
 	local repo=$1
 	local arch=$2
-	local pkgs=(${@:3})
+	local pkgs=("${@:3}")
 
 	# package files might be relative to repo dir
 	pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null
-	/usr/bin/repo-add -q "${repo}${DBEXT}" ${pkgs[@]} >/dev/null \
+	/usr/bin/repo-add -q "${repo}${DBEXT}" "${pkgs[@]}" >/dev/null \
 		|| error "repo-add ${repo}${DBEXT} ${pkgs[*]}"
-	/usr/bin/repo-add -f -q "${repo}${FILESEXT}" ${pkgs[@]} \
+	/usr/bin/repo-add -f -q "${repo}${FILESEXT}" "${pkgs[@]}" \
 		|| error "repo-add -f ${repo}${FILESEXT} ${pkgs[*]}"
 	popd >/dev/null
 	set_repo_permission "${repo}" "${arch}"
@@ -436,7 +436,7 @@ arch_repo_add() {
 arch_repo_remove() {
 	local repo=$1
 	local arch=$2
-	local pkgs=(${@:3})
+	local pkgs=("${@:3}")
 	local dbfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}"
 	local filesfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${FILESEXT}"
 
@@ -444,9 +444,9 @@ arch_repo_remove() {
 		error "No database found at '${dbfile}'"
 		return 1
 	fi
-	/usr/bin/repo-remove -q "${dbfile}" ${pkgs[@]} >/dev/null \
+	/usr/bin/repo-remove -q "${dbfile}" "${pkgs[@]}" >/dev/null \
 		|| error "repo-remove ${dbfile} ${pkgs[*]}"
-	/usr/bin/repo-remove -q "${filesfile}" ${pkgs[@]} \
+	/usr/bin/repo-remove -q "${filesfile}" "${pkgs[@]}" \
 		|| error "repo-remove ${filesfile} ${pkgs[*]}"
 	set_repo_permission "${repo}" "${arch}"
 
diff --git a/db-list-unsigned-packages b/db-list-unsigned-packages
index 5105096..f593686 100755
--- a/db-list-unsigned-packages
+++ b/db-list-unsigned-packages
@@ -31,7 +31,7 @@ fi
 arch=$1
 shift
 
-for repo in ${PKGREPOS[@]}
+for repo in "${PKGREPOS[@]}"
 do
     db="${FTP_BASE}/${repo}/os/${arch}/${repo}.db"
     [ -f "$db" ] && "$(dirname "$(readlink -e "$0")")/db-list-unsigned-packages.py" "$repo" "$@" < "$db"
diff --git a/db-move b/db-move
index 1b34404..c66b088 100755
--- a/db-move
+++ b/db-move
@@ -8,7 +8,7 @@ if [ $# -lt 3 ]; then
 	exit 1
 fi
 
-args=(${@})
+args=("${@}")
 repo_from="${args[0]}"
 repo_to="${args[1]}"
 ftppath_from="${FTP_BASE}/${repo_from}/os/"
@@ -19,14 +19,14 @@ if ! check_repo_permission $repo_to || ! check_repo_permission $repo_from; then
 fi
 
 # TODO: this might lock too much (architectures)
-for pkgarch in ${ARCHES[@]}; do
+for pkgarch in "${ARCHES[@]}"; do
 	repo_lock ${repo_to} ${pkgarch} || exit 1
 	repo_lock ${repo_from} ${pkgarch} || exit 1
 done
 
 # check if packages to be moved exist in xbs and ftp dir
-for pkgbase in ${args[@]:2}; do
-	for pkgarch in ${ARCHES[@]} 'any'; do
+for pkgbase in "${args[@]:2}"; do
+	for pkgarch in "${ARCHES[@]}" 'any'; do
 		xbsrepo_from="$(xbs releasepath ${pkgbase} ${repo_from} ${pkgarch})"
 		if [ -r "${xbsrepo_from}/PKGBUILD" ]; then
 			pkgnames=($(. "${xbsrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
@@ -34,19 +34,18 @@ for pkgbase in ${args[@]:2}; do
 				die "Could not read pkgname"
 			fi
 
-
 			if [ "${pkgarch}" == 'any' ]; then
-				tarches=(${ARCHES[@]})
+				tarches=("${ARCHES[@]}")
 			else
 				tarches=("${pkgarch}")
 			fi
 
-			for pkgname in ${pkgnames[@]}; do
+			for pkgname in "${pkgnames[@]}"; do
 				pkgver=$(. "${xbsrepo_from}/PKGBUILD"; get_full_version ${pkgname})
 				if [ -z "${pkgver}" ]; then
 					die "Could not read pkgver"
 				fi
-				for tarch in ${tarches[@]}; do
+				for tarch in "${tarches[@]}"; do
 					getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT} >/dev/null
 				done
 			done
@@ -60,11 +59,11 @@ msg "Moving packages from [${repo_from}] to [${repo_to}]..."
 
 declare -A add_pkgs
 declare -A remove_pkgs
-for pkgbase in ${args[@]:2}; do
+for pkgbase in "${args[@]:2}"; do
 	# move the package in xbs
 	arches=($(xbs move ${repo_from} ${repo_to} ${pkgbase}))
 	# move the package in ftp
-	for pkgarch in ${arches[@]}; do
+	for pkgarch in "${arches[@]}"; do
 		dir_to="$(xbs releasepath $pkgbase $repo_to $pkgarch)"
 		if true; then # to add in indent level to make merging easier
 			if [ "${pkgarch}" == 'any' ]; then
@@ -74,9 +73,9 @@ for pkgbase in ${args[@]:2}; do
 			fi
 			pkgnames=($(. "${dir_to}/PKGBUILD"; echo ${pkgname[@]}))
 
-			for pkgname in ${pkgnames[@]}; do
+			for pkgname in "${pkgnames[@]}"; do
 				pkgver=$(. "${dir_to}/PKGBUILD"; get_full_version ${pkgname})
-				for tarch in ${tarches[@]}; do
+				for tarch in "${tarches[@]}"; do
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT})
 					pkgfile="${pkgpath##*/}"
 
@@ -92,14 +91,14 @@ for pkgbase in ${args[@]:2}; do
 	done
 done
 
-for tarch in ${ARCHES[@]}; do
+for tarch in "${ARCHES[@]}"; do
 	if [ -n "${add_pkgs[${tarch}]}" ]; then
 		arch_repo_add "${repo_to}" "${tarch}" ${add_pkgs[${tarch}]}
 		arch_repo_remove "${repo_from}" "${tarch}" ${remove_pkgs[${tarch}]}
 	fi
 done
 
-for pkgarch in ${ARCHES[@]}; do
+for pkgarch in "${ARCHES[@]}"; do
 	repo_unlock ${repo_from} ${pkgarch}
 	repo_unlock ${repo_to} ${pkgarch}
 done
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
 
diff --git a/db-sync b/db-sync
index e4b6966..3595876 100755
--- a/db-sync
+++ b/db-sync
@@ -67,8 +67,8 @@ init() {
 	get_repos
 
 	# Traverse all repo-arch pairs
-	for _repo in ${ARCHREPOS[@]}; do
-		for _arch in ${ARCHARCHES[@]}; do
+	for _repo in "${ARCHREPOS[@]}"; do
+		for _arch in "${ARCHARCHES[@]}"; do
 			msg "Processing ${_repo}-${_arch}"
 
 			db_file=$(get_repo_file ${_repo} ${_arch})${DBEXT}
@@ -165,7 +165,6 @@ init() {
 			rsync://${mirror}/${mirrorpath}/${SRCPOOL}/ \
 			${FTP_BASE}/${SRCPOOL}/
 	done
-        
 
 	# Cleanup
 	unset blacklist whitelists _arch _repo repo_file
diff --git a/db-update b/db-update
index 8cf61fc..c4bd33b 100755
--- a/db-update
+++ b/db-update
@@ -16,26 +16,26 @@ fi
 
 repos=()
 for staging_repo in ${staging_repos[@]##*/}; do
-	if in_array ${staging_repo} ${PKGREPOS[@]}; then
-		repos+=(${staging_repo})
+	if in_array "${staging_repo}" "${PKGREPOS[@]}"; then
+		repos+=("${staging_repo}")
 	fi
 done
 
 # TODO: this might lock too much (architectures)
-for repo in ${repos[@]}; do
-	for pkgarch in ${ARCHES[@]}; do
+for repo in "${repos[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
 		repo_lock ${repo} ${pkgarch} || exit 1
 	done
 done
 
 # check if packages are valid
-for repo in ${repos[@]}; do
+for repo in "${repos[@]}"; do
 	pkgs=($(getpkgfiles "${STAGING}/${repo}/"*${PKGEXT}))
 	if [ $? -eq 0 ]; then
 		if [ ${#pkgs[@]} -gt 0 ] && ! check_repo_permission "${repo}"; then
 			die "You don't have permission to update packages in ${repo}"
 		fi
-		for pkg in ${pkgs[@]}; do
+		for pkg in "${pkgs[@]}"; do
 			if [ -h "${pkg}" ]; then
 				die "Package ${repo}/${pkg##*/} is a symbolic link"
 			fi
@@ -60,13 +60,13 @@ for repo in ${repos[@]}; do
 	fi
 done
 
-for repo in ${repos[@]}; do
+for repo in "${repos[@]}"; do
 	msg "Updating [${repo}]..."
 	any_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-any${PKGEXT} 2>/dev/null))
-	for pkgarch in ${ARCHES[@]}; do
+	for pkgarch in "${ARCHES[@]}"; do
 		add_pkgs=()
 		arch_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-${pkgarch}${PKGEXT} 2>/dev/null))
-		for pkg in ${arch_pkgs[@]} ${any_pkgs[@]}; do
+		for pkg in "${arch_pkgs[@]}" "${any_pkgs[@]}"; do
 			pkgfile="${pkg##*/}"
 			msg2 "${pkgfile} (${pkgarch})"
 			# any packages might have been moved by the previous run
@@ -81,16 +81,16 @@ 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+=("${pkgfile}")
 		done
 		if [ ${#add_pkgs[@]} -ge 1 ]; then
-			arch_repo_add "${repo}" "${pkgarch}" ${add_pkgs[@]}
+			arch_repo_add "${repo}" "${pkgarch}" "${add_pkgs[@]}"
 		fi
 	done
 done
 
-for repo in ${repos[@]}; do
-	for pkgarch in ${ARCHES[@]}; do
+for repo in "${repos[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${pkgarch}
 	done
 done
diff --git a/get-repos b/get-repos
index 5096433..b8d2ccb 100755
--- a/get-repos
+++ b/get-repos
@@ -25,8 +25,8 @@ trap "rm -rf -- $(printf '%q' "${WORKDIR}")" EXIT
 DBLIST=()
 
 # Repos
-for _repo in ${PKGREPOS[@]}; do
-    for _arch in ${ARCHES[@]}; do
+for _repo in "${PKGREPOS[@]}"; do
+    for _arch in "${ARCHES[@]}"; do
         DBLIST+=("http://repo.parabolagnulinux.org/${_repo}/os/${_arch}/${_repo}${FILESEXT}")
     done
 done
@@ -37,7 +37,7 @@ wget --directory-prefix=${WORKDIR} \
      --no-verbose \
      --force-directories \
      --no-host-directories \
-     ${DBLIST[@]} || true 
+     "${DBLIST[@]}" || true
 # Always return true, some databases are expect to be missing
 
 # Create the arches regexp arch1|arch2
diff --git a/repo-restore-to-normal b/repo-restore-to-normal
index 3fe4816..063aacf 100755
--- a/repo-restore-to-normal
+++ b/repo-restore-to-normal
@@ -12,7 +12,7 @@ PKGREPOS=(community)
 #    sed "s/^\(.\+-[^-]\+-[^-]\+\)-[^-]\+$/\1/"))
 
 # Traverse all repos
-for _repo in ${PKGREPOS[@]}; do
+for _repo in "${PKGREPOS[@]}"; do
     msg "Restoring [${_repo}]"
 
 # Find all pkgnames on this repo's abs
@@ -27,7 +27,7 @@ for _repo in ${PKGREPOS[@]}; do
                   >/dev/null 2>&1
 
 # also cleanup package functions
-            for _pkg in ${pkgname[@]}; do
+            for _pkg in "${pkgname[@]}"; do
                 unset package_${pkg} >/dev/null 2>&1
 # this fills the on_abs array
                 echo ${_pkg}-${pkgver}-${pkgrel}
@@ -49,7 +49,7 @@ for _repo in ${PKGREPOS[@]}; do
     msg2 "Restoring the following packages:"
 #    plain "$(echo ${restore[@]} | tr ' ' "\n")"
 
-    for _pkg in ${on_abs[@]}; do
+    for _pkg in "${on_abs[@]}"; do
         find ${CLEANUP_DESTDIR} -name "${_pkg}*" -exec cp -v '{}' ${STAGING}/${_repo} \;
     done
 
-- 
cgit v1.2.3-54-g00ecf


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.

---
 config       |  2 +-
 createrepos  |  2 +-
 db-functions | 22 +++++++++++-----------
 db-move      |  2 +-
 db-remove    | 14 +++++++-------
 db-update    | 16 ++++++++--------
 6 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'db-move')

diff --git a/config b/config
index 0152b69..9d72ebd 100644
--- a/config
+++ b/config
@@ -12,7 +12,7 @@ USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jor
 # Community project repos
 PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism')
 # Remote repos
-PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]})
+PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}")
 PKGPOOL='pool/packages'
 SRCPOOL='sources/packages'
 
diff --git a/createrepos b/createrepos
index 926c158..1840c83 100755
--- a/createrepos
+++ b/createrepos
@@ -5,4 +5,4 @@ source $(dirname $0)/config
 
 mkdir -p -- "${FTP_BASE}"/{"${PKGPOOL}","${SRCPOOL}"} "${ARCH_BASE}" "${CLEANUP_DESTDIR}" "${SOURCE_CLEANUP_DESTDIR}" "${STAGING}"
 
-$(dirname $0)/create-repo ${PKGREPOS[@]}
+$(dirname $0)/create-repo "${PKGREPOS[@]}"
diff --git a/db-functions b/db-functions
index f56ca19..59e9c29 100644
--- a/db-functions
+++ b/db-functions
@@ -445,8 +445,8 @@ check_pkgrepos() {
 #usage: chk_license ${license[@]}"
 chk_license() {
 	local l
-	for l in ${@}; do
-		in_array ${l} ${ALLOWED_LICENSES[@]} && return 0
+	for l in "${@}"; do
+		in_array "${l}" "${ALLOWED_LICENSES[@]}" && return 0
 	done
 
 	return 1
@@ -458,7 +458,7 @@ check_repo_permission() {
 	[ ${#PKGREPOS[@]} -eq 0 ] && return 1
 	[ -z "${PKGPOOL}" ] && return 1
 
-	in_array "${repo}" ${PKGREPOS[@]} || return 1
+	in_array "${repo}" "${PKGREPOS[@]}" || return 1
 
 	[ -w "$FTP_BASE/${PKGPOOL}" ] || return 1
 
@@ -497,10 +497,10 @@ arch_repo_add() {
 
 	# package files might be relative to repo dir
 	pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null
-	/usr/bin/repo-add -q "${repo}${DBEXT}" ${pkgs[@]} >/dev/null \
-		|| error "repo-add ${repo}${DBEXT} ${pkgs[@]}"
-	/usr/bin/repo-add -f -q "${repo}${FILESEXT}" ${pkgs[@]} \
-		|| error "repo-add -f ${repo}${FILESEXT} ${pkgs[@]}"
+	/usr/bin/repo-add -q "${repo}${DBEXT}" "${pkgs[@]}" >/dev/null \
+		|| error "repo-add ${repo}${DBEXT} ${pkgs[*]}"
+	/usr/bin/repo-add -f -q "${repo}${FILESEXT}" "${pkgs[@]}" \
+		|| error "repo-add -f ${repo}${FILESEXT} ${pkgs[*]}"
 	popd >/dev/null
 	set_repo_permission "${repo}" "${arch}"
 }
@@ -516,9 +516,9 @@ arch_repo_remove() {
 		error "No database found at '${dbfile}'"
 		return 1
 	fi
-	/usr/bin/repo-remove -q "${dbfile}" ${pkgs[@]} >/dev/null \
-		|| error "repo-remove ${dbfile} ${pkgs[@]}"
-	/usr/bin/repo-remove -q "${filesfile}" ${pkgs[@]} \
-		|| error "repo-remove ${filesfile} ${pkgs[@]}"
+	/usr/bin/repo-remove -q "${dbfile}" "${pkgs[@]}" >/dev/null \
+		|| error "repo-remove ${dbfile} ${pkgs[*]}"
+	/usr/bin/repo-remove -q "${filesfile}" "${pkgs[@]}" \
+		|| error "repo-remove ${filesfile} ${pkgs[*]}"
 	set_repo_permission "${repo}" "${arch}"
 }
diff --git a/db-move b/db-move
index 010d941..69f24ac 100755
--- a/db-move
+++ b/db-move
@@ -66,7 +66,7 @@ for pkgbase in ${args[@]:2}; do
 
 		if [ -f "${svnrepo_from}/PKGBUILD" ]; then
 			if [ "${pkgarch}" == 'any' ]; then
-				tarches=(${ARCHES[@]})
+				tarches=("${ARCHES[@]}")
 			else
 				tarches=("${pkgarch}")
 			fi
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
diff --git a/db-update b/db-update
index 1fddb8a..cdde63b 100755
--- a/db-update
+++ b/db-update
@@ -15,14 +15,14 @@ if [ $? -ge 1 ]; then
 fi
 
 # TODO: this might lock too much (architectures)
-for repo in ${repos[@]}; do
-	for pkgarch in ${ARCHES[@]}; do
+for repo in "${repos[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
 		repo_lock ${repo} ${pkgarch} || exit 1
 	done
 done
 
 # check if packages are valid
-for repo in ${repos[@]}; do
+for repo in "${repos[@]}"; do
 	pkgs=($(getpkgfiles "${STAGING}/${repo}/"*${PKGEXT}))
 	if [ $? -eq 0 ]; then
 		if [ ${#pkgs[@]} -gt 0 ] && ! check_repo_permission "${repo}"; then
@@ -48,7 +48,7 @@ for repo in ${repos[@]}; do
 	fi
 done
 
-for repo in ${repos[@]}; do
+for repo in "${repos[@]}"; do
 	msg "Updating [${repo}]..."
 	any_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-any${PKGEXT} 2>/dev/null))
 	for pkgarch in ${ARCHES[@]}; do
@@ -69,16 +69,16 @@ 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+=("${pkgfile}")
 		done
 		if [ ${#add_pkgs[@]} -ge 1 ]; then
-			arch_repo_add "${repo}" "${pkgarch}" ${add_pkgs[@]}
+			arch_repo_add "${repo}" "${pkgarch}" "${add_pkgs[@]}"
 		fi
 	done
 done
 
-for repo in ${repos[@]}; do
-	for pkgarch in ${ARCHES[@]}; do
+for repo in "${repos[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${pkgarch}
 	done
 done
-- 
cgit v1.2.3-54-g00ecf


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.

---
 any-to-ours                   |  4 ++--
 create-repo                   |  8 ++++----
 createrepos                   |  4 ++--
 cron-jobs/ftpdir-cleanup      |  4 ++--
 cron-jobs/integrity-check     |  4 ++--
 cron-jobs/repo-sanity-check   |  4 ++--
 cron-jobs/sourceballs         |  2 +-
 cron-jobs/sourceballs2        |  2 +-
 cron-jobs/update-abs-tarballs |  2 +-
 cron-jobs/update-web-db       |  6 +++---
 db-check-nonfree              |  6 +++---
 db-cleanup                    |  4 ++--
 db-functions                  | 14 +++++++-------
 db-list-unsigned-packages     |  8 ++++----
 db-move                       |  6 +++---
 db-remove                     |  6 +++---
 db-repo-add                   |  6 +++---
 db-repo-remove                |  6 +++---
 db-sync                       | 16 ++++++++--------
 db-update                     |  6 +++---
 get-repos                     |  6 +++---
 migrate-repo                  |  2 +-
 mkrepo                        |  4 ++--
 repo-restore-to-normal        |  4 ++--
 testing2x                     |  8 ++++----
 yf-update                     | 12 ++++++------
 26 files changed, 77 insertions(+), 77 deletions(-)

(limited to 'db-move')

diff --git a/any-to-ours b/any-to-ours
index b927b82..a1697c7 100755
--- a/any-to-ours
+++ b/any-to-ours
@@ -7,8 +7,8 @@ trap_exit() {
     exit 1
 }
 
-source $(dirname $0)/config
-source $(dirname $0)/libremessages
+source "$(dirname "$(readlink -e "$0")")/config"
+source "$(dirname "$(readlink -e "$0")")/libremessages"
 
 # From makepkg
 set -E
diff --git a/create-repo b/create-repo
index 58842c3..24b890d 100755
--- a/create-repo
+++ b/create-repo
@@ -1,11 +1,11 @@
 #!/bin/bash
 # Creates repository structure
 
-. "$(dirname $0)/db-functions"
-. "$(dirname $0)/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
+. "$(dirname "$(readlink -e "$0")")/config"
 
 if [ $# -eq 0 ]; then
-    msg "Usage: $0 repo1 [repo2 ... repoX]"
+    msg "Usage: ${0##*/} repo1 [repo2 ... repoX]"
     exit 1
 fi
 
@@ -21,4 +21,4 @@ for _repo in $@; do
     done
 done
 
-msg "Don't forget to add them to the PKGREPOS array on $(dirname $0)/config"
+msg "Don't forget to add them to the PKGREPOS array on %s/config" "$(dirname "$(readlink -e "$0")")"
diff --git a/createrepos b/createrepos
index 1840c83..a8f93e8 100755
--- a/createrepos
+++ b/createrepos
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Creates the repo structure defined in config
 
-source $(dirname $0)/config
+source "$(dirname "$(readlink -e "$0")")/config"
 
 mkdir -p -- "${FTP_BASE}"/{"${PKGPOOL}","${SRCPOOL}"} "${ARCH_BASE}" "${CLEANUP_DESTDIR}" "${SOURCE_CLEANUP_DESTDIR}" "${STAGING}"
 
-$(dirname $0)/create-repo "${PKGREPOS[@]}"
+"$(dirname "$(readlink -e "$0")")/create-repo" "${PKGREPOS[@]}"
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 83e6e17..8d691b5 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/../db-functions"
-. "$(dirname $0)/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
+. "$(dirname "$(readlink -e "$0")")/../config"
 
 clean_pkg() {
 	local pkg
diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check
index d4f9694..05a56a5 100755
--- a/cron-jobs/integrity-check
+++ b/cron-jobs/integrity-check
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dirname="$(dirname $0)"
+dirname="$(dirname "$(readlink -e "$0")")"
 
 . "${dirname}/../db-functions"
 . "${dirname}/../config"
@@ -8,7 +8,7 @@ dirname="$(dirname $0)"
 script_lock
 
 if [ $# -ne 1 ]; then
-	die "usage: $(basename $0) <mailto>"
+	die "usage: ${0##*/} <mailto>"
 fi
 mailto=$1
 
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 1ba90a6..2aa7892 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Solves issue165
 
-. "$(dirname $0)/../db-functions"
-. "$(dirname $0)/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
+. "$(dirname "$(readlink -e "$0")")/../config"
 
 # Traverse all repos
 for _repo in ${PKGREPOS[@]}; do
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index ee074bd..73d8432 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dirname="$(dirname $(readlink -e $0))"
+dirname="$(dirname "$(readlink -e "$0")")"
 . "${dirname}/../db-functions"
 . "${dirname}/../config"
 pushd "${WORKDIR}" >/dev/null
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index 5644268..eb46579 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -4,7 +4,7 @@
 # Makepkg --allsource every package
 # Remove the old sourceballs
 
-dirname="$(dirname $(readlink -e $0))"
+dirname="$(dirname "$(readlink -e "$0")")"
 . "${dirname}/../db-functions"
 . "${dirname}/../config"
 . "${MAKEPKGCONF}"
diff --git a/cron-jobs/update-abs-tarballs b/cron-jobs/update-abs-tarballs
index 824ac34..901cc4b 100755
--- a/cron-jobs/update-abs-tarballs
+++ b/cron-jobs/update-abs-tarballs
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(dirname $0)/../config"
+. "$(dirname "$(readlink -e "$0")")/../config"
 
 rsync -av --exclude=staging/ parabolagnulinux.org::abstar/ ${FTP_BASE}/
 
diff --git a/cron-jobs/update-web-db b/cron-jobs/update-web-db
index 6ced4c1..825eea6 100755
--- a/cron-jobs/update-web-db
+++ b/cron-jobs/update-web-db
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/../db-functions"
-. "$(dirname $0)/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
+. "$(dirname "$(readlink -e "$0")")/../config"
 
 # setup paths
 SPATH="/srv/http/archweb"
@@ -14,7 +14,7 @@ REPOS=('community-testing' 'multilib-testing' 'multilib' 'community' 'extra' 'te
 LOGOUT="/tmp/archweb_update.log"
 
 # figure out what operation to perform
-cmd="$(basename $0)"
+cmd="${0##*/}"
 if [[ $cmd != "update-web-db" && $cmd != "update-web-files-db" ]]; then
 	die "Invalid command name '$cmd' specified!"
 fi
diff --git a/db-check-nonfree b/db-check-nonfree
index ecad3b9..661daa6 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -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 [ $# -ge 1 ]; then
-	warning "Calling $(basename $0) with a specific repository is not supported"
+	warning "Calling ${0##*/} with a specific repository is not supported"
 	exit 1
 fi
 
diff --git a/db-cleanup b/db-cleanup
index abad390..57ef36e 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -15,8 +15,8 @@ trap_exit() {
     exit 1
 }
 
-source $(dirname $0)/config
-source $(dirname $0)/libremessages
+source "$(dirname "$(readlink -e "$0")")/config"
+source "$(dirname "$(readlink -e "$0")")/libremessages"
 
 # From makepkg
 set -E
diff --git a/db-functions b/db-functions
index 59e9c29..26b23e4 100644
--- a/db-functions
+++ b/db-functions
@@ -16,7 +16,7 @@ restore_umask () {
 }
 
 # set up general environment
-WORKDIR=$(mktemp -dt "$(basename $0).XXXXXXXXXX")
+WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX")
 LOCKS=()
 
 # check if messages are to be printed using color
@@ -85,10 +85,10 @@ get_full_version() {
 }
 
 script_lock() {
-	local LOCKDIR="$TMPDIR/.scriptlock.$(basename $0)"
+	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
 		local _owner="$(/usr/bin/stat -c %U $LOCKDIR)"
-		error "Script $(basename $0) is already locked by $_owner."
+		error "Script ${0##*/} is already locked by $_owner."
 		exit 1
 	else
 		set_umask
@@ -97,9 +97,9 @@ script_lock() {
 }
 
 script_unlock() {
-	local LOCKDIR="$TMPDIR/.scriptlock.$(basename $0)"
+	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if [ ! -d "$LOCKDIR" ]; then
-		warning "Script $(basename $0) was not locked!"
+		warning "Script ${0##*/} was not locked!"
 		restore_umask
 		return 1
 	else
@@ -123,8 +123,8 @@ cleanup() {
 			repo_unlock $repo $arch
 		fi
 	done
-	if [ -d "$TMPDIR/.scriptlock.$(basename $0)" ]; then
-		msg "Removing left over lock from $(basename $0)"
+	if [ -d "$TMPDIR/.scriptlock.${0##*/}" ]; then
+		msg "Removing left over lock from ${0##*/}"
 		script_unlock
 	fi
 	rm -rf "$WORKDIR"
diff --git a/db-list-unsigned-packages b/db-list-unsigned-packages
index 3b5a5bd..985d1c0 100755
--- a/db-list-unsigned-packages
+++ b/db-list-unsigned-packages
@@ -20,11 +20,11 @@ set -e
 # unsigned packages available for architecture $1 and specified for
 # architecture $2 (usually $1 or any, default is to list all).
 
-. "$(dirname $0)/db-functions"
-. "$(dirname $0)/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
+. "$(dirname "$(readlink -e "$0")")/config"
 
 if [ $# -lt 1 ]; then
-	msg "usage: $(basename $0) <architecture>"
+	msg "usage: ${0##*/} <architecture>"
 	exit 1
 fi
 
@@ -34,5 +34,5 @@ shift
 for repo in ${PKGREPOS[@]}
 do
     db="${FTP_BASE}/${repo}/os/${arch}/${repo}.db"
-    [ -f "$db" ] && "$(dirname $0)/db-list-unsigned-packages.py" "$repo" "$@" < "$db"
+    [ -f "$db" ] && "$(dirname "$(readlink -e "$0")")/db-list-unsigned-packages.py" "$repo" "$@" < "$db"
 done
diff --git a/db-move b/db-move
index 69f24ac..a3f1532 100755
--- a/db-move
+++ b/db-move
@@ -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-from> <repo-to> <pkgname|pkgbase> ..."
+	msg "usage: ${0##*/} <repo-from> <repo-to> <pkgname|pkgbase> ..."
 	exit 1
 fi
 
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
 
diff --git a/db-repo-add b/db-repo-add
index b83fb77..2b7894a 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -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> <pkgfile> ..."
+	msg "usage: ${0##*/} <repo> <arch> <pkgfile> ..."
 	exit 1
 fi
 
diff --git a/db-repo-remove b/db-repo-remove
index 4f04ed1..09e34da 100755
--- a/db-repo-remove
+++ b/db-repo-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> ..."
+	msg "usage: ${0##*/} <repo> <arch> <pkgname> ..."
 	exit 1
 fi
 
diff --git a/db-sync b/db-sync
index e8481d6..c4d495e 100755
--- a/db-sync
+++ b/db-sync
@@ -21,7 +21,7 @@ ${VERBOSE} && extra="-v"
 
 # Returns contents of a repo
 get_repos() {
-        mkdir -p ${TMPDIR}/$0.$$.cache
+        mkdir -p ${TMPDIR}/${0##*/}.$$.cache
 # Exclude everything but db files
   rsync ${extra} -mrtlH --no-p --include="*/" \
         --include="*.db" \
@@ -30,7 +30,7 @@ get_repos() {
         --include="*${FILESEXT}" \
         --exclude="*" \
         --delete-after \
-        rsync://${mirror}/${mirrorpath}/ ${TMPDIR}/$0.$$.cache
+        rsync://${mirror}/${mirrorpath}/ ${TMPDIR}/${0##*/}.$$.cache
 }
 
 get_repo_content() {
@@ -48,7 +48,7 @@ get_blacklist() {
 # repo
 # arch
 get_repo_file() {
-  echo "${TMPDIR}/$0.$$.cache/${1}/os/${2}/${1}"
+  echo "${TMPDIR}/${0##*/}.$$.cache/${1}/os/${2}/${1}"
 }
 
 # Process the databases and get the libre packages
@@ -118,7 +118,7 @@ init() {
       rsync ${extra} -rtlH \
             --delay-updates \
             --safe-links \
-            ${TMPDIR}/$0.$$.cache/${_repo}/os/${_arch}/ \
+            ${TMPDIR}/${0##*/}.$$.cache/${_repo}/os/${_arch}/ \
             ${FTP_BASE}/${_repo}/os/${_arch}/
 
 # Cleanup
@@ -176,9 +176,9 @@ trap_exit() {
 }
 
 
-source $(dirname $0)/config
-source $(dirname $0)/local_config
-source $(dirname $0)/libremessages
+source "$(dirname "$(readlink -e "$0")")/config"
+source "$(dirname "$(readlink -e "$0")")/local_config"
+source "$(dirname "$(readlink -e "$0")")/libremessages"
 
 # From makepkg
 set -E
@@ -189,4 +189,4 @@ trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
 
 init
 
-rm -r ${TMPDIR}/$0.$$.cache
+rm -r ${TMPDIR}/${0##*/}.$$.cache
diff --git a/db-update b/db-update
index cdde63b..86faec3 100755
--- a/db-update
+++ b/db-update
@@ -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 [ $# -ge 1 ]; then
-	warning "Calling $(basename $0) with a specific repository is no longer supported"
+	warning "Calling ${0##*/} with a specific repository is no longer supported"
 	exit 1
 fi
 
diff --git a/get-repos b/get-repos
index 92db9a2..a477cf2 100755
--- a/get-repos
+++ b/get-repos
@@ -9,8 +9,8 @@ trap_exit() {
     exit 1
 }
 
-source $(dirname $0)/config
-source $(dirname $0)/libremessages
+source "$(dirname "$(readlink -e "$0")")/config"
+source "$(dirname "$(readlink -e "$0")")/libremessages"
 
 # From makepkg
 set -E
@@ -19,7 +19,7 @@ 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
 
-TMPDIR="$(mktemp -dt "$(basename $0).XXXX")"
+TMPDIR="$(mktemp -dt "${0##*/}.XXXX")"
 DBLIST=()
 
 # Repos
diff --git a/migrate-repo b/migrate-repo
index 2e44adb..751d5bd 100755
--- a/migrate-repo
+++ b/migrate-repo
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source $(dirname $0)/config
+source "$(dirname "$(readlink -e "$0")")/config"
 
 #dryrun="--dry-run"
 
diff --git a/mkrepo b/mkrepo
index 5f704cc..10d014b 100755
--- a/mkrepo
+++ b/mkrepo
@@ -3,8 +3,8 @@
 # License: GPLv3+
 # Description: A script to quickly create new [repos]
 
-source $(dirname $0)/config
-source $(dirname $0)/local_config
+source "$(dirname "$(readlink -e "$0")")/config"
+source "$(dirname "$(readlink -e "$0")")/local_config"
 
 # TODO it would be simpler to expand arrays to {element1,element2,etc}
 for repo in $@; do
diff --git a/repo-restore-to-normal b/repo-restore-to-normal
index 9463731..3636920 100755
--- a/repo-restore-to-normal
+++ b/repo-restore-to-normal
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Solves issue165
 
-. "$(dirname $0)/db-functions"
-. "$(dirname $0)/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
+. "$(dirname "$(readlink -e "$0")")/config"
 
 CLEANUP_DESTDIR=/home/parabolavnx/repo/pool/restore
 PKGREPOS=(community)
diff --git a/testing2x b/testing2x
index 54cae11..14a45de 100755
--- a/testing2x
+++ b/testing2x
@@ -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 1 ]; then
-	msg "usage: $(basename $0) <pkgname|pkgbase> ..."
+	msg "usage: ${0##*/} <pkgname|pkgbase> ..."
 	exit 1
 fi
 
@@ -54,7 +54,7 @@ for repo in  'core' 'extra'; do
 		repo_unlock ${repo} ${pkgarch}
 	done
 	if [ -n "${pkgs[${repo}]}" ]; then
-		"$(dirname $0)/db-move" 'testing' "${repo}" ${pkgs[${repo}]}
+		"$(dirname "$(readlink -e "$0")")/db-move" 'testing' "${repo}" ${pkgs[${repo}]}
 	fi
 done
 
diff --git a/yf-update b/yf-update
index 9c2131e..3bce4aa 100755
--- a/yf-update
+++ b/yf-update
@@ -1,17 +1,17 @@
 #!/bin/bash
-source $(dirname $0)/local_config
-source $(dirname $0)/config
-source $(dirname $0)/libremessages
+source "$(dirname "$(readlink -e "$0")")/local_config"
+source "$(dirname "$(readlink -e "$0")")/config"
+source "$(dirname "$(readlink -e "$0")")/libremessages"
 
 blacklist_mtime=$(printf "%.0f" $(find ${blacklist} -printf "%T@"))
-last_bl_mtime=$(cat $(dirname $0)/yftime)
+last_bl_mtime=$(cat "$(dirname "$(readlink -e "$0")")/yftime")
 
 if [ $blacklist_mtime -gt $last_bl_mtime ]; then
-    pushd $(dirname $0)/yf
+    pushd "$(dirname "$(readlink -e "$0")")/yf"
     makepkg -f
     find . -name "*${PKGEXT}" -exec mv {} ${STAGING}/libre \;
     popd
-    echo ${blacklist_mtime} > $(dirname $0)/yftime
+    echo ${blacklist_mtime} > "$(dirname "$(readlink -e "$0")")/yftime"
     msg2 "built and staged"
 else
     msg2 "nothing to do"
-- 
cgit v1.2.3-54-g00ecf


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

---
 cron-jobs/sourceballs | 12 ++++++------
 db-functions          | 14 +++++++-------
 db-move               |  2 +-
 db-remove             |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'db-move')

diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 4debcee..6393472 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -59,11 +59,11 @@ for repo in ${PKGREPOS[@]}; do
 		pkgarch=${pkginfo[2]}
 		pkglicense=(${pkginfo[@]:3})
 
-		# Should this packages be skipped?
+		# Should this package be skipped?
 		if grep -Fqx "${pkgbase}" "${dirname}/sourceballs.skip"; then
 			continue
 		fi
-        # Commenting out, we'll sourceball everything
+		# Commenting out, we'll sourceball everything
 		# Check if the license or .force file does not enforce creating a source package
 #		if ! (chk_license ${pkglicense[@]} || grep -Fqx "${pkgbase}" "${dirname}/sourceballs.force"); then
 #			continue
@@ -83,10 +83,10 @@ for repo in ${PKGREPOS[@]}; do
 			#svn export -q "${SVNREPO}/${pkgbase}/repos/${repo}-${pkgarch}" \
 			#	"${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1
 
-            # If it's on official repos, nor [libre], nor [libre-testing]
-            cp -r "${SVNREPO}/$repo/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
-            cp -r "${SVNREPO}/libre/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
-            cp -r "${SVNREPO}/libre-testing/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1
+			# If it's on official repos, nor [libre], nor [libre-testing]
+			cp -r "${SVNREPO}/$repo/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
+				cp -r "${SVNREPO}/libre/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
+				cp -r "${SVNREPO}/libre-testing/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1
 			if [ $? -ge 1 ]; then
 				failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
 				continue
diff --git a/db-functions b/db-functions
index 26b23e4..e681504 100644
--- a/db-functions
+++ b/db-functions
@@ -375,7 +375,7 @@ check_splitpkgs() {
 	for pkgfile in ${pkgfiles[@]}; do
 		issplitpkg "${pkgfile}" || continue
 		local _pkgbase="$(getpkgbase ${pkgfile})"
-        msg2 "Checking $_pkgbase"
+		msg2 "Checking $_pkgbase"
 		local _pkgname="$(getpkgname ${pkgfile})"
 		local _pkgarch="$(getpkgarch ${pkgfile})"
 		mkdir -p "${repo}/${_pkgarch}/${_pkgbase}"
@@ -384,14 +384,14 @@ check_splitpkgs() {
 		if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
 			mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
 
-            cp -r ${SVNREPO}/$repo/$_pkgbase/PKGBUILD "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null 2>&1 || \
-            cp -r ${SVNREPO}/libre/$_pkgbase/PKGBUILD "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null 2>&1 || \
-            cp -r ${SVNREPO}/libre-testing/$_pkgbase/PKGBUILD "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/$_pkgbase">/dev/null 2>&1
+			cp -r ${SVNREPO}/$repo/$_pkgbase/PKGBUILD "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null 2>&1 || \
+				cp -r ${SVNREPO}/libre/$_pkgbase/PKGBUILD "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null 2>&1 || \
+				cp -r ${SVNREPO}/libre-testing/$_pkgbase/PKGBUILD "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/$_pkgbase">/dev/null 2>&1
 
 			[[ $? -ge 1 ]] && {
-                echo "Failed $_pkgbase-$_pkgver-$_pkgarch"
-                return 1
-            }
+				echo "Failed $_pkgbase-$_pkgver-$_pkgarch"
+				return 1
+			}
 		fi
 
 		local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo ${pkgname[@]}))
diff --git a/db-move b/db-move
index a3f1532..41ef4c1 100755
--- a/db-move
+++ b/db-move
@@ -24,7 +24,7 @@ for pkgarch in ${ARCHES[@]}; do
 	repo_lock ${repo_from} ${pkgarch} || exit 1
 done
 
-# No idea why we loop twice... -- fauno
+# First loop is to check that all necessary files exist
 for pkgbase in ${args[@]:2}; do
 	for pkgarch in ${ARCHES[@]} 'any'; do
 		svnrepo_from="${SVNREPO}/${repo_from}/${pkgbase}"
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-54-g00ecf


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

---
 create-repo                 | 2 +-
 cron-jobs/ftpdir-cleanup    | 2 +-
 cron-jobs/integrity-check   | 2 +-
 cron-jobs/repo-sanity-check | 2 +-
 cron-jobs/sourceballs       | 2 +-
 cron-jobs/sourceballs2      | 2 +-
 cron-jobs/update-web-db     | 2 +-
 db-check-nonfree            | 2 +-
 db-list-unsigned-packages   | 2 +-
 db-move                     | 2 +-
 db-remove                   | 2 +-
 db-repo-add                 | 2 +-
 db-repo-remove              | 2 +-
 db-update                   | 2 +-
 repo-restore-to-normal      | 2 +-
 testing2x                   | 2 +-
 yf-update                   | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'db-move')

diff --git a/create-repo b/create-repo
index 24b890d..21a2a9c 100755
--- a/create-repo
+++ b/create-repo
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Creates repository structure
 
-. "$(dirname "$(readlink -e "$0")")/db-functions"
 . "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -eq 0 ]; then
     msg "Usage: ${0##*/} repo1 [repo2 ... repoX]"
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 8d691b5..b290138 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/../db-functions"
 . "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 clean_pkg() {
 	local pkg
diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check
index 05a56a5..86a8f1d 100755
--- a/cron-jobs/integrity-check
+++ b/cron-jobs/integrity-check
@@ -2,8 +2,8 @@
 
 dirname="$(dirname "$(readlink -e "$0")")"
 
-. "${dirname}/../db-functions"
 . "${dirname}/../config"
+. "${dirname}/../db-functions"
 
 script_lock
 
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 2aa7892..ee4c061 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Solves issue165
 
-. "$(dirname "$(readlink -e "$0")")/../db-functions"
 . "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 # Traverse all repos
 for _repo in ${PKGREPOS[@]}; do
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 6393472..c9aadba 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 dirname="$(dirname "$(readlink -e "$0")")"
-. "${dirname}/../db-functions"
 . "${dirname}/../config"
+. "${dirname}/../db-functions"
 pushd "${WORKDIR}" >/dev/null
 
 script_lock
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index bbe227d..1432bdf 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -5,8 +5,8 @@
 # Remove the old sourceballs
 
 dirname="$(dirname "$(readlink -e "$0")")"
-. "${dirname}/../db-functions"
 . "${dirname}/../config"
+. "${dirname}/../db-functions"
 . "${MAKEPKGCONF}"
 
 pushd "${WORKDIR}" >/dev/null
diff --git a/cron-jobs/update-web-db b/cron-jobs/update-web-db
index 825eea6..713e75e 100755
--- a/cron-jobs/update-web-db
+++ b/cron-jobs/update-web-db
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/../db-functions"
 . "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 # setup paths
 SPATH="/srv/http/archweb"
diff --git a/db-check-nonfree b/db-check-nonfree
index 661daa6..5cb7f6f 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/db-functions"
 . "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -ge 1 ]; then
 	warning "Calling ${0##*/} with a specific repository is not supported"
diff --git a/db-list-unsigned-packages b/db-list-unsigned-packages
index 985d1c0..5105096 100755
--- a/db-list-unsigned-packages
+++ b/db-list-unsigned-packages
@@ -20,8 +20,8 @@ set -e
 # unsigned packages available for architecture $1 and specified for
 # architecture $2 (usually $1 or any, default is to list all).
 
-. "$(dirname "$(readlink -e "$0")")/db-functions"
 . "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 1 ]; then
 	msg "usage: ${0##*/} <architecture>"
diff --git a/db-move b/db-move
index 41ef4c1..eed48eb 100755
--- a/db-move
+++ b/db-move
@@ -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-from> <repo-to> <pkgname|pkgbase> ..."
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> ..."
diff --git a/db-repo-add b/db-repo-add
index 2b7894a..a6355a1 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -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> <pkgfile> ..."
diff --git a/db-repo-remove b/db-repo-remove
index 09e34da..7077d62 100755
--- a/db-repo-remove
+++ b/db-repo-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> ..."
diff --git a/db-update b/db-update
index 86faec3..e3da232 100755
--- a/db-update
+++ b/db-update
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/db-functions"
 . "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -ge 1 ]; then
 	warning "Calling ${0##*/} with a specific repository is no longer supported"
diff --git a/repo-restore-to-normal b/repo-restore-to-normal
index 3636920..3fe4816 100755
--- a/repo-restore-to-normal
+++ b/repo-restore-to-normal
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Solves issue165
 
-. "$(dirname "$(readlink -e "$0")")/db-functions"
 . "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
 
 CLEANUP_DESTDIR=/home/parabolavnx/repo/pool/restore
 PKGREPOS=(community)
diff --git a/testing2x b/testing2x
index 14a45de..b6828fc 100755
--- a/testing2x
+++ b/testing2x
@@ -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 1 ]; then
 	msg "usage: ${0##*/} <pkgname|pkgbase> ..."
diff --git a/yf-update b/yf-update
index 3bce4aa..b6dff14 100755
--- a/yf-update
+++ b/yf-update
@@ -1,6 +1,6 @@
 #!/bin/bash
-source "$(dirname "$(readlink -e "$0")")/local_config"
 source "$(dirname "$(readlink -e "$0")")/config"
+source "$(dirname "$(readlink -e "$0")")/local_config"
 source "$(dirname "$(readlink -e "$0")")/libremessages"
 
 blacklist_mtime=$(printf "%.0f" $(find ${blacklist} -printf "%T@"))
-- 
cgit v1.2.3-54-g00ecf


From 9d9116bd23720cf6c5b27aa39e5cc4c71de1fb26 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 21:27:07 -0500
Subject: Fix some array quoting.

---
 create-repo                                  |  4 ++--
 cron-jobs/check_archlinux/parse_pkgbuilds.sh | 22 +++++++++++-----------
 cron-jobs/ftpdir-cleanup                     | 10 +++++-----
 cron-jobs/repo-sanity-check                  |  4 ++--
 cron-jobs/sourceballs                        | 28 ++++++++++++++--------------
 cron-jobs/sourceballs2                       |  4 ++--
 db-check-nonfree                             | 22 +++++++++++-----------
 db-functions                                 | 26 +++++++++++++-------------
 db-list-unsigned-packages                    |  2 +-
 db-move                                      | 28 ++++++++++++++--------------
 db-update                                    |  8 ++++----
 get-repos                                    |  6 +++---
 repo-restore-to-normal                       |  6 +++---
 13 files changed, 85 insertions(+), 85 deletions(-)

(limited to 'db-move')

diff --git a/create-repo b/create-repo
index 21a2a9c..1ec9798 100755
--- a/create-repo
+++ b/create-repo
@@ -10,12 +10,12 @@ if [ $# -eq 0 ]; then
 fi
 
 msg "Creating repos..."
-for _repo in $@; do
+for _repo in "$@"; do
     msg2 "Creating [${_repo}]"
     mkdir -p "${FTP_BASE}/staging/${_repo}" || \
         error "Failed creating staging dir"
 
-    for _arch in ${ARCHES[@]}; do
+    for _arch in "${ARCHES[@]}"; do
         mkdir -p "${FTP_BASE}/${_repo}/os/${_arch}" || \
             error "Failed creating ${_arch} dir"
     done
diff --git a/cron-jobs/check_archlinux/parse_pkgbuilds.sh b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
index 3f92169..c8d8618 100755
--- a/cron-jobs/check_archlinux/parse_pkgbuilds.sh
+++ b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
@@ -6,18 +6,18 @@
 exit() { return; }
 
 splitpkg_overrides=('depends' 'optdepends' 'provides' 'conflicts')
-variables=('pkgname' 'pkgbase' 'epoch' 'pkgver' 'pkgrel' 'makedepends' 'arch' ${splitpkg_overrides[@]})
+variables=('pkgname' 'pkgbase' 'epoch' 'pkgver' 'pkgrel' 'makedepends' 'arch' "${splitpkg_overrides[@]}")
 readonly -a variables splitpkg_overrides
 
 backup_package_variables() {
-	for var in ${splitpkg_overrides[@]}; do
+	for var in "${splitpkg_overrides[@]}"; do
 		indirect="${var}_backup"
 		eval "${indirect}=(\${$var[@]})"
 	done
 }
 
 restore_package_variables() {
-	for var in ${splitpkg_overrides[@]}; do
+	for var in "${splitpkg_overrides[@]}"; do
 		indirect="${var}_backup"
 		if [ -n "${!indirect}" ]; then
 			eval "${var}=(\${$indirect[@]})"
@@ -42,31 +42,31 @@ print_info() {
 
 	if [ -n "$arch" ]; then
 		echo "%ARCH%"
-		for i in ${arch[@]}; do echo $i; done
+		for i in "${arch[@]}"; do echo $i; done
 		echo ""
 	fi
 	if [ -n "$depends" ]; then
 		echo "%DEPENDS%"
-		for i in ${depends[@]}; do
+		for i in "${depends[@]}"; do
 			echo $i
 		done
 		echo ""
 	fi
 	if [ -n "$makedepends" ]; then
 		echo "%MAKEDEPENDS%"
-		for i in ${makedepends[@]}; do
+		for i in "${makedepends[@]}"; do
 			echo $i
 		done
 		echo ""
 	fi
 	if [ -n "$conflicts" ]; then
 		echo "%CONFLICTS%"
-		for i in ${conflicts[@]}; do echo $i; done
+		for i in "${conflicts[@]}"; do echo $i; done
 		echo ""
 	fi
 	if [ -n "$provides" ]; then
 		echo "%PROVIDES%"
-		for i in ${provides[@]}; do echo $i; done
+		for i in "${provides[@]}"; do echo $i; done
 		echo ""
 	fi
 }
@@ -75,7 +75,7 @@ source_pkgbuild() {
 	ret=0
 	dir=$1
 	pkgbuild=$dir/PKGBUILD
-	for var in ${variables[@]}; do
+	for var in "${variables[@]}"; do
 		unset ${var}
 	done
 	source $pkgbuild &>/dev/null || ret=$?
@@ -88,7 +88,7 @@ source_pkgbuild() {
 
 	if [ "${#pkgname[@]}" -gt "1" ]; then
 		pkgbase=${pkgbase:-${pkgname[0]}}
-		for pkg in ${pkgname[@]}; do
+		for pkg in "${pkgname[@]}"; do
 			if [ "$(type -t package_${pkg})" != "function" ]; then
 				echo -e "%INVALID%\n$pkgbuild\n"
 				return 1
@@ -98,7 +98,7 @@ source_pkgbuild() {
 				while IFS= read -r line; do
 					var=${line%%=*}
 					var="${var#"${var%%[![:space:]]*}"}"   # remove leading whitespace characters
-					for realvar in ${variables[@]}; do
+					for realvar in "${variables[@]}"; do
 						if [ "$var" == "$realvar" ]; then
 							eval $line
 							break
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index b290138..6455ed7 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -25,8 +25,8 @@ clean_pkg() {
 
 ${CLEANUP_DRYRUN} && warning 'dry run mode is active'
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
 		fi
@@ -69,7 +69,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 fi
 
 # cleanup of legacy $repo/os/any directories
-for repo in ${PKGREPOS[@]}; do
+for repo in "${PKGREPOS[@]}"; do
 	if [ ! -d "${FTP_BASE}/${repo}/os/any" ]; then
 		continue
 	fi
@@ -103,8 +103,8 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	done
 fi
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${arch}
 	done
 done
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index ee4c061..9d351df 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -5,7 +5,7 @@
 . "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 # Traverse all repos
-for _repo in ${PKGREPOS[@]}; do
+for _repo in "${PKGREPOS[@]}"; do
     msg "Cleaning up [${_repo}]"
 
 # Find all pkgnames on this repo's abs
@@ -19,7 +19,7 @@ for _repo in ${PKGREPOS[@]}; do
                   >/dev/null 2>&1
 
 # also cleanup package functions
-            for _pkg in ${pkgname[@]}; do
+            for _pkg in "${pkgname[@]}"; do
                 unset package_${pkg} >/dev/null 2>&1
             done
             
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index c9aadba..8171980 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -7,8 +7,8 @@ pushd "${WORKDIR}" >/dev/null
 
 script_lock
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_lock ${repo} ${arch} || exit 1
 	done
 done
@@ -18,8 +18,8 @@ renice +10 -p $$ > /dev/null
 
 # Create a readable file for each repo with the following format
 # <pkgbase|pkgname> <pkgver>-<pkgrel> <arch> <license>[ <license>]
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		# Repo does not exist; skip it
 		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
@@ -39,8 +39,8 @@ for repo in ${PKGREPOS[@]}; do
 	done | sort -u > "${WORKDIR}/db-${repo}"
 done
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${arch}
 	done
 done
@@ -49,15 +49,15 @@ done
 find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
 
 # Check for all packages if we need to build a source package
-for repo in ${PKGREPOS[@]}; do
+for repo in "${PKGREPOS[@]}"; do
 	newpkgs=()
 	failedpkgs=()
 	while read line; do
-		pkginfo=(${line})
+		pkginfo=("${line}")
 		pkgbase=${pkginfo[0]}
 		pkgver=${pkginfo[1]}
 		pkgarch=${pkginfo[2]}
-		pkglicense=(${pkginfo[@]:3})
+		pkglicense=("${pkginfo[@]:3}")
 
 		# Should this package be skipped?
 		if grep -Fqx "${pkgbase}" "${dirname}/sourceballs.skip"; then
@@ -88,7 +88,7 @@ for repo in ${PKGREPOS[@]}; do
 				cp -r "${SVNREPO}/libre/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
 				cp -r "${SVNREPO}/libre-testing/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1
 			if [ $? -ge 1 ]; then
-				failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
+				failedpkgs+=("${pkgbase}-${pkgver}${SRCEXT}")
 				continue
 			fi
 
@@ -109,13 +109,13 @@ for repo in ${PKGREPOS[@]}; do
 
 	if [ ${#newpkgs[@]} -ge 1 ]; then
 		msg "Adding source packages for [${repo}]..."
-		for new_pkg in ${newpkgs[@]}; do
+		for new_pkg in "${newpkgs[@]}"; do
 			msg2 "${new_pkg}"
 		done
 	fi
 	if [ ${#failedpkgs[@]} -ge 1 ]; then
 		msg "Failed to create source packages for [${repo}]..."
-		for failed_pkg in ${failedpkgs[@]}; do
+		for failed_pkg in "${failedpkgs[@]}"; do
 			msg2 "${failed_pkg}"
 		done
 	fi
@@ -129,7 +129,7 @@ old_pkgs=($(comm -23 "${WORKDIR}/available-src-pkgs.sort" "${WORKDIR}/expected-s
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old source packages..."
 	${SOURCE_CLEANUP_DRYRUN} && warning 'dry run mode is active'
-	for old_pkg in ${old_pkgs[@]}; do
+	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 "${old_pkg}"
 		if ! ${SOURCE_CLEANUP_DRYRUN}; then
 			mv "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
@@ -141,7 +141,7 @@ fi
 old_pkgs=($(find ${SOURCE_CLEANUP_DESTDIR} -type f -name "*${SRCEXT}" -mtime +${SOURCE_CLEANUP_KEEP} -printf '%f\n'))
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old source packages from the cleanup directory..."
-	for old_pkg in ${old_pkgs[@]}; do
+	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 "${old_pkg}"
 		${SOURCE_CLEANUP_DRYRUN} || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 	done
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index 1432bdf..2a26e6a 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -21,7 +21,7 @@ find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort
 
 pushd "${SVNREPO}" >/dev/null
 
-for repo in ${PKGREPOS[@]}; do
+for repo in "${PKGREPOS[@]}"; do
     msg "Sourceballing [${repo}]"
 
     pushd $repo >/dev/null
@@ -40,7 +40,7 @@ for repo in ${PKGREPOS[@]}; do
         unset build package url pkgdesc source md5sums depends makedepends \
               optdepends license arch options check mksource
 
-        for _pkg in ${pkgname[@]}; do
+        for _pkg in "${pkgname[@]}"; do
             unset package_${_pkg} >/dev/null 2>&1
         done
 
diff --git a/db-check-nonfree b/db-check-nonfree
index 5cb7f6f..6e2dc17 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -9,16 +9,16 @@ if [ $# -ge 1 ]; then
 fi
 
 # TODO: this might lock too much (architectures)
-for repo in ${repos[@]}; do
-	for pkgarch in ${ARCHES[@]}; do
+for repo in "${repos[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
 		repo_lock ${repo} ${pkgarch} || exit 1
 	done
 done
 
 msg "Check nonfree in repo:"
 nonfree=($(cut -d: -f1 ${BLACKLIST_FILE} | sort -u))
-for repo in ${ARCHREPOS[@]}; do
-    for pkgarch in ${ARCHES[@]}; do
+for repo in "${ARCHREPOS[@]}"; do
+    for pkgarch in "${ARCHES[@]}"; do
 	msg2 "$repo $pkgarch"
 	if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then
 	    continue
@@ -27,20 +27,20 @@ for repo in ${ARCHREPOS[@]}; do
 	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})
+	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[@]}
+        msg2 "Nonfree: ${cleanpkgs[*]}"
+	    arch_repo_remove "${repo}" "${pkgarch}" "${cleanpkgs[@]}"
 	fi
     done
 done
 
-for repo in ${repos[@]}; do
-	for pkgarch in ${ARCHES[@]}; do
+for repo in "${repos[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${pkgarch}
 	done
 done
diff --git a/db-functions b/db-functions
index e681504..83e0613 100644
--- a/db-functions
+++ b/db-functions
@@ -115,7 +115,7 @@ cleanup() {
 	local arch
 
 	trap - EXIT INT QUIT TERM
-	for l in ${LOCKS[@]}; do
+	for l in "${LOCKS[@]}"; do
 		repo=${l%.*}
 		arch=${l#*.}
 		if [ -d "$TMPDIR/.repolock.$repo.$arch" ]; then
@@ -299,7 +299,7 @@ getpkgfiles() {
 		exit 1
 	fi
 
-	for f in ${@}; do
+	for f in "${@}"; do
 		if  [ ! -f "${f}" ]; then
 			error "Package ${f} not found!"
 			exit 1
@@ -309,7 +309,7 @@ getpkgfiles() {
 		fi
 	done
 
-	echo ${@}
+	echo "${@}"
 }
 
 check_pkgfile() {
@@ -322,7 +322,7 @@ check_pkgfile() {
 	local pkgarch="$(getpkgarch ${pkgfile})"
 	[ $? -ge 1 ] && return 1
 
-	in_array "${pkgarch}" ${ARCHES[@]} 'any' || return 1
+	in_array "${pkgarch}" "${ARCHES[@]}" 'any' || return 1
 
 	if echo "$(basename ${pkgfile})" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then
 		return 0
@@ -343,7 +343,7 @@ check_pkgsvn() {
 	[ $? -ge 1 ] && return 1
 	local repo="${2}"
 
-	in_array "${repo}" ${PKGREPOS[@]} || return 1
+	in_array "${repo}" "${PKGREPOS[@]}" || return 1
 
 	if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
 		mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
@@ -356,7 +356,7 @@ check_pkgsvn() {
 	[ "${svnver}" == "${_pkgver}" ] || return 1
 
 	local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo ${pkgname[@]}))
-	in_array "${_pkgname}" ${svnnames[@]} || return 1
+	in_array "${_pkgname}" "${svnnames[@]}" || return 1
 
 	return 0
 }
@@ -364,7 +364,7 @@ check_pkgsvn() {
 check_splitpkgs() {
 	local repo="${1}"
 	shift
-	local pkgfiles=(${@})
+	local pkgfiles=("${@}")
 	local pkgfile
 	local pkgdir
 	local svnname
@@ -372,7 +372,7 @@ check_splitpkgs() {
 	mkdir -p "${WORKDIR}/check_splitpkgs/"
 	pushd "${WORKDIR}/check_splitpkgs" >/dev/null
 
-	for pkgfile in ${pkgfiles[@]}; do
+	for pkgfile in "${pkgfiles[@]}"; do
 		issplitpkg "${pkgfile}" || continue
 		local _pkgbase="$(getpkgbase ${pkgfile})"
 		msg2 "Checking $_pkgbase"
@@ -395,7 +395,7 @@ check_splitpkgs() {
 		fi
 
 		local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo ${pkgname[@]}))
-		for svnname in ${svnnames[@]}; do
+		for svnname in "${svnnames[@]}"; do
 			echo "${svnname}" >> "${repo}/${_pkgarch}/${_pkgbase}/svn"
 		done
 	done
@@ -430,8 +430,8 @@ check_pkgrepos() {
 
 	local repo
 	local arch
-	for repo in ${PKGREPOS[@]}; do
-		for arch in ${ARCHES[@]}; do
+	for repo in "${PKGREPOS[@]}"; do
+		for arch in "${ARCHES[@]}"; do
 			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
 			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT}.sig ] && return 1
 			[ -f "${FTP_BASE}/${repo}/os/${arch}/$(basename ${pkgfile})" ] && return 1
@@ -493,7 +493,7 @@ set_repo_permission() {
 arch_repo_add() {
 	local repo=$1
 	local arch=$2
-	local pkgs=(${@:3})
+	local pkgs=("${@:3}")
 
 	# package files might be relative to repo dir
 	pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null
@@ -508,7 +508,7 @@ arch_repo_add() {
 arch_repo_remove() {
 	local repo=$1
 	local arch=$2
-	local pkgs=(${@:3})
+	local pkgs=("${@:3}")
 	local dbfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}"
 	local filesfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${FILESEXT}"
 
diff --git a/db-list-unsigned-packages b/db-list-unsigned-packages
index 5105096..f593686 100755
--- a/db-list-unsigned-packages
+++ b/db-list-unsigned-packages
@@ -31,7 +31,7 @@ fi
 arch=$1
 shift
 
-for repo in ${PKGREPOS[@]}
+for repo in "${PKGREPOS[@]}"
 do
     db="${FTP_BASE}/${repo}/os/${arch}/${repo}.db"
     [ -f "$db" ] && "$(dirname "$(readlink -e "$0")")/db-list-unsigned-packages.py" "$repo" "$@" < "$db"
diff --git a/db-move b/db-move
index eed48eb..a6abb8f 100755
--- a/db-move
+++ b/db-move
@@ -8,7 +8,7 @@ if [ $# -lt 3 ]; then
 	exit 1
 fi
 
-args=(${@})
+args=("${@}")
 repo_from="${args[0]}"
 repo_to="${args[1]}"
 ftppath_from="${FTP_BASE}/${repo_from}/os/"
@@ -19,14 +19,14 @@ if ! check_repo_permission $repo_to || ! check_repo_permission $repo_from; then
 fi
 
 # TODO: this might lock too much (architectures)
-for pkgarch in ${ARCHES[@]}; do
+for pkgarch in "${ARCHES[@]}"; do
 	repo_lock ${repo_to} ${pkgarch} || exit 1
 	repo_lock ${repo_from} ${pkgarch} || exit 1
 done
 
 # First loop is to check that all necessary files exist
-for pkgbase in ${args[@]:2}; do
-	for pkgarch in ${ARCHES[@]} 'any'; do
+for pkgbase in "${args[@]:2}"; do
+	for pkgarch in "${ARCHES[@]}" 'any'; do
 		svnrepo_from="${SVNREPO}/${repo_from}/${pkgbase}"
 		if [ -r "${svnrepo_from}/PKGBUILD" ]; then
 			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
@@ -40,13 +40,13 @@ for pkgbase in ${args[@]:2}; do
 			fi
 
 			if [ "${pkgarch}" == 'any' ]; then
-				tarches=(${ARCHES[@]})
+				tarches=("${ARCHES[@]}")
 			else
 				tarches=("${pkgarch}")
 			fi
 
-			for pkgname in ${pkgnames[@]}; do
-				for tarch in ${tarches[@]}; do
+			for pkgname in "${pkgnames[@]}"; do
+				for tarch in "${tarches[@]}"; do
 					getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT} >/dev/null
 				done
 			done
@@ -60,8 +60,8 @@ msg "Moving packages from [${repo_from}] to [${repo_to}]..."
 
 declare -A add_pkgs
 declare -A remove_pkgs
-for pkgbase in ${args[@]:2}; do
-	for pkgarch in ${ARCHES[@]} 'any'; do
+for pkgbase in "${args[@]:2}"; do
+	for pkgarch in "${ARCHES[@]}" 'any'; do
 		svnrepo_from="${SVNREPO}/${repo_from}/${pkgbase}"
 
 		if [ -f "${svnrepo_from}/PKGBUILD" ]; then
@@ -70,12 +70,12 @@ for pkgbase in ${args[@]:2}; do
 			else
 				tarches=("${pkgarch}")
 			fi
-			msg2 "${pkgbase} ($(echo ${tarches[@]}))"
+			msg2 "${pkgbase} (${tarches[*]})"
 			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
 			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
 
-			for pkgname in ${pkgnames[@]}; do
-				for tarch in ${tarches[@]}; do
+			for pkgname in "${pkgnames[@]}"; do
+				for tarch in "${tarches[@]}"; do
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT})
 					pkgfile=$(basename "${pkgpath}")
 
@@ -96,14 +96,14 @@ for pkgbase in ${args[@]:2}; do
 	done
 done
 
-for tarch in ${ARCHES[@]}; do
+for tarch in "${ARCHES[@]}"; do
 	if [ -n "${add_pkgs[${tarch}]}" ]; then
 		arch_repo_add "${repo_to}" "${tarch}" ${add_pkgs[${tarch}]}
 		arch_repo_remove "${repo_from}" "${tarch}" ${remove_pkgs[${tarch}]}
 	fi
 done
 
-for pkgarch in ${ARCHES[@]}; do
+for pkgarch in "${ARCHES[@]}"; do
 	repo_unlock ${repo_from} ${pkgarch}
 	repo_unlock ${repo_to} ${pkgarch}
 done
diff --git a/db-update b/db-update
index e3da232..60cc6cd 100755
--- a/db-update
+++ b/db-update
@@ -28,7 +28,7 @@ for repo in "${repos[@]}"; do
 		if [ ${#pkgs[@]} -gt 0 ] && ! check_repo_permission "${repo}"; then
 			die "You don't have permission to update packages in ${repo}"
 		fi
-		for pkg in ${pkgs[@]}; do
+		for pkg in "${pkgs[@]}"; do
 			if [ -h "${pkg}" ]; then
 				die "Package ${repo}/$(basename ${pkg}) is a symbolic link"
 			fi
@@ -40,7 +40,7 @@ for repo in "${repos[@]}"; do
 			fi
 		done
 		# This is fucking obnoxious
-		#if ! check_splitpkgs ${repo} ${pkgs[@]}; then
+		#if ! check_splitpkgs ${repo} "${pkgs[@]}"; then
 		#	die "Missing split packages for ${repo}"
 		#fi
 	else
@@ -51,10 +51,10 @@ done
 for repo in "${repos[@]}"; do
 	msg "Updating [${repo}]..."
 	any_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-any${PKGEXT} 2>/dev/null))
-	for pkgarch in ${ARCHES[@]}; do
+	for pkgarch in "${ARCHES[@]}"; do
 		add_pkgs=()
 		arch_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-${pkgarch}${PKGEXT} 2>/dev/null))
-		for pkg in ${arch_pkgs[@]} ${any_pkgs[@]}; do
+		for pkg in "${arch_pkgs[@]}" "${any_pkgs[@]}"; do
 			pkgfile="$(basename ${pkg})"
 			msg2 "${pkgfile} (${pkgarch})"
 			# any packages might have been moved by the previous run
diff --git a/get-repos b/get-repos
index a477cf2..b98d601 100755
--- a/get-repos
+++ b/get-repos
@@ -23,8 +23,8 @@ TMPDIR="$(mktemp -dt "${0##*/}.XXXX")"
 DBLIST=()
 
 # Repos
-for _repo in ${PKGREPOS[@]}; do
-    for _arch in ${ARCHES[@]}; do
+for _repo in "${PKGREPOS[@]}"; do
+    for _arch in "${ARCHES[@]}"; do
         DBLIST+=("http://repo.parabolagnulinux.org/${_repo}/os/${_arch}/${_repo}${FILESEXT}")
     done
 done
@@ -35,7 +35,7 @@ wget --directory-prefix=${TMPDIR} \
      --no-verbose \
      --force-directories \
      --no-host-directories \
-     ${DBLIST[@]} || true 
+     "${DBLIST[@]}" || true
 # Always return true, some databases are expect to be missing
 
 # Create the arches regexp arch1|arch2
diff --git a/repo-restore-to-normal b/repo-restore-to-normal
index 3fe4816..063aacf 100755
--- a/repo-restore-to-normal
+++ b/repo-restore-to-normal
@@ -12,7 +12,7 @@ PKGREPOS=(community)
 #    sed "s/^\(.\+-[^-]\+-[^-]\+\)-[^-]\+$/\1/"))
 
 # Traverse all repos
-for _repo in ${PKGREPOS[@]}; do
+for _repo in "${PKGREPOS[@]}"; do
     msg "Restoring [${_repo}]"
 
 # Find all pkgnames on this repo's abs
@@ -27,7 +27,7 @@ for _repo in ${PKGREPOS[@]}; do
                   >/dev/null 2>&1
 
 # also cleanup package functions
-            for _pkg in ${pkgname[@]}; do
+            for _pkg in "${pkgname[@]}"; do
                 unset package_${pkg} >/dev/null 2>&1
 # this fills the on_abs array
                 echo ${_pkg}-${pkgver}-${pkgrel}
@@ -49,7 +49,7 @@ for _repo in ${PKGREPOS[@]}; do
     msg2 "Restoring the following packages:"
 #    plain "$(echo ${restore[@]} | tr ' ' "\n")"
 
-    for _pkg in ${on_abs[@]}; do
+    for _pkg in "${on_abs[@]}"; do
         find ${CLEANUP_DESTDIR} -name "${_pkg}*" -exec cp -v '{}' ${STAGING}/${_repo} \;
     done
 
-- 
cgit v1.2.3-54-g00ecf


From d3afe9bb766bbdfaab1474d21fd5e28f0a356039 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 20:49:48 -0500
Subject: Avoid using $(basename $var) , use ${var##*/} instead

---
 abslibre                 |  2 +-
 cron-jobs/ftpdir-cleanup |  2 +-
 db-functions             | 10 +++++-----
 db-move                  |  2 +-
 db-update                |  8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'db-move')

diff --git a/abslibre b/abslibre
index fa777ac..a5733f0 100755
--- a/abslibre
+++ b/abslibre
@@ -96,7 +96,7 @@ sync_pre_mips64el() {
 # Create .abs.tar.gz tarballs
 create_tarballs() {
     for repo in ${ABSLIBRE}/{i686,x86_64}/*; do
-        baserepo=$(basename $repo)
+        baserepo=${repo##*/}
         arch=$(basename $(dirname $repo))
 
 # Remove the old one
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 6455ed7..cb14382 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -16,7 +16,7 @@ clean_pkg() {
 				if [ -e "$pkg.sig" ]; then
 					mv -f "$pkg.sig" "$CLEANUP_DESTDIR"
 				fi
-				touch "${CLEANUP_DESTDIR}/$(basename ${pkg})"
+				touch "${CLEANUP_DESTDIR}/${pkg##*/}"
 			fi
 		done
 	fi
diff --git a/db-functions b/db-functions
index 83e0613..52ad8bb 100644
--- a/db-functions
+++ b/db-functions
@@ -324,7 +324,7 @@ check_pkgfile() {
 
 	in_array "${pkgarch}" "${ARCHES[@]}" 'any' || return 1
 
-	if echo "$(basename ${pkgfile})" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then
+	if echo "${pkgfile##*/}" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then
 		return 0
 	else
 		return 1
@@ -425,8 +425,8 @@ check_pkgrepos() {
 
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT}.sig ] && return 1
-	[ -f "${FTP_BASE}/${PKGPOOL}/$(basename ${pkgfile})" ] && return 1
-	[ -f "${FTP_BASE}/${PKGPOOL}/$(basename ${pkgfile}).sig" ] && return 1
+	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}" ] && return 1
+	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}.sig" ] && return 1
 
 	local repo
 	local arch
@@ -434,8 +434,8 @@ check_pkgrepos() {
 		for arch in "${ARCHES[@]}"; do
 			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
 			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT}.sig ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/$(basename ${pkgfile})" ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/$(basename ${pkgfile}).sig" ] && return 1
+			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}" ] && return 1
+			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}.sig" ] && return 1
 		done
 	done
 
diff --git a/db-move b/db-move
index a6abb8f..f1c3dea 100755
--- a/db-move
+++ b/db-move
@@ -77,7 +77,7 @@ for pkgbase in "${args[@]:2}"; do
 			for pkgname in "${pkgnames[@]}"; do
 				for tarch in "${tarches[@]}"; do
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT})
-					pkgfile=$(basename "${pkgpath}")
+					pkgfile="${pkgpath##*/}"
 
 					# copy package to pool if needed
 					# TODO: can be removed once every package has been moved to the package pool
diff --git a/db-update b/db-update
index 60cc6cd..99c8be5 100755
--- a/db-update
+++ b/db-update
@@ -30,13 +30,13 @@ for repo in "${repos[@]}"; do
 		fi
 		for pkg in "${pkgs[@]}"; do
 			if [ -h "${pkg}" ]; then
-				die "Package ${repo}/$(basename ${pkg}) is a symbolic link"
+				die "Package ${repo}/${pkg##*/} is a symbolic link"
 			fi
 			if ! check_pkgfile "${pkg}"; then
-				die "Package ${repo}/$(basename ${pkg}) is not consistent with its meta data"
+				die "Package ${repo}/${pkg##*/} is not consistent with its meta data"
 			fi
 			if ! check_pkgrepos "${pkg}"; then
-				die "Package ${repo}/$(basename ${pkg}) already exists in another repository"
+				die "Package ${repo}/${pkg##*/} already exists in another repository"
 			fi
 		done
 		# This is fucking obnoxious
@@ -55,7 +55,7 @@ for repo in "${repos[@]}"; do
 		add_pkgs=()
 		arch_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-${pkgarch}${PKGEXT} 2>/dev/null))
 		for pkg in "${arch_pkgs[@]}" "${any_pkgs[@]}"; do
-			pkgfile="$(basename ${pkg})"
+			pkgfile="${pkg##*/}"
 			msg2 "${pkgfile} (${pkgarch})"
 			# any packages might have been moved by the previous run
 			if [ -f "${pkg}" ]; then
-- 
cgit v1.2.3-54-g00ecf


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

---
 cron-jobs/ftpdir-cleanup        |  2 +-
 db-functions                    | 30 +++++++++++++++---------------
 db-move                         |  4 ++--
 db-remove                       |  2 +-
 test/lib/common.inc             | 12 ++++++------
 test/test.d/create-filelists.sh | 34 +++++++++++++++++-----------------
 6 files changed, 42 insertions(+), 42 deletions(-)

(limited to 'db-move')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 292952b..77d90d2 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -53,7 +53,7 @@ for repo in "${PKGREPOS[@]}"; do
 		old_pkgs=($(comm -23 "${WORKDIR}/repo-${repo}-${arch}" "${WORKDIR}/db-${repo}-${arch}"))
 		if [ ${#old_pkgs[@]} -ge 1 ]; then
 			msg "Removing old packages from [${repo}] (${arch})..."
-			for old_pkg in ${old_pkgs[@]}; do
+			for old_pkg in "${old_pkgs[@]}"; do
 				msg2 "${old_pkg}"
 				clean_pkg "${FTP_BASE}/${repo}/os/${arch}/${old_pkg}"
 			done
diff --git a/db-functions b/db-functions
index 5b10e05..86a2b1e 100644
--- a/db-functions
+++ b/db-functions
@@ -12,7 +12,7 @@ set_umask () {
 }
 
 restore_umask () {
-	umask $UMASK >/dev/null
+	umask "$UMASK" >/dev/null
 }
 
 # just like mv -f, but we touch the file and then copy the content so
@@ -39,7 +39,7 @@ REPO_MODIFIED=0
 script_lock() {
 	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
-		local _owner="$(/usr/bin/stat -c %U $LOCKDIR)"
+		local _owner="$(/usr/bin/stat -c %U "$LOCKDIR")"
 		error "Script ${0##*/} is already locked by $_owner."
 		exit 1
 	else
@@ -72,7 +72,7 @@ cleanup() {
 		arch=${l#*.}
 		if [ -d "$TMPDIR/.repolock.$repo.$arch" ]; then
 			msg "Removing left over lock from [${repo}] (${arch})"
-			repo_unlock $repo $arch
+			repo_unlock "$repo" "$arch"
 		fi
 	done
 	if [ -d "$TMPDIR/.scriptlock.${0##*/}" ]; then
@@ -85,7 +85,7 @@ cleanup() {
 		date +%s > "${FTP_BASE}/lastupdate"
 	fi
 
-	[ "$1" ] && exit $1
+	[ "$1" ] && exit "$1"
 }
 
 abort() {
@@ -133,9 +133,9 @@ repo_lock () {
 	fi
 
 	_count=0
-	while [ $_count -le $_trial ] || $_lockblock ; do
+	while [ "$_count" -le "$_trial" ] || "$_lockblock" ; do
 		if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
-			_owner="$(/usr/bin/stat -c %U $LOCKDIR)"
+			_owner="$(/usr/bin/stat -c %U "$LOCKDIR")"
 			warning "Repo [${1}] (${2}) is already locked by $_owner. "
 			msg2 "Retrying in $LOCK_DELAY seconds..."
 		else
@@ -143,7 +143,7 @@ repo_lock () {
 			set_umask
 			return 0
 		fi
-		sleep $LOCK_DELAY
+		sleep "$LOCK_DELAY"
 		let _count=$_count+1
 	done
 
@@ -241,12 +241,12 @@ getpkgfile() {
 	elif [ ! -f "${1}" ]; then
 		error "Package ${1} not found!"
 		exit 1
-	elif ${REQUIRE_SIGNATURE} && [ ! -f "${1}.sig" ]; then
+	elif "${REQUIRE_SIGNATURE}" && [ ! -f "${1}.sig" ]; then
 		error "Package signature ${1}.sig not found!"
 		exit 1
 	fi
 
-	echo ${1}
+	echo "${1}"
 }
 
 getpkgfiles() {
@@ -260,7 +260,7 @@ getpkgfiles() {
 		if  [ ! -f "${f}" ]; then
 			error "Package ${f} not found!"
 			exit 1
-		elif ${REQUIRE_SIGNATURE} && [ ! -f "${f}.sig" ]; then
+		elif "${REQUIRE_SIGNATURE}" && [ ! -f "${f}.sig" ]; then
 			error "Package signature ${f}.sig not found!"
 			exit 1
 		fi
@@ -272,11 +272,11 @@ getpkgfiles() {
 check_pkgfile() {
 	local pkgfile=$1
 
-	local pkgname="$(getpkgname ${pkgfile})"
+	local pkgname="$(getpkgname "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local pkgver="$(getpkgver ${pkgfile})"
+	local pkgver="$(getpkgver "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local pkgarch="$(getpkgarch ${pkgfile})"
+	local pkgarch="$(getpkgarch "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
 
 	in_array "${pkgarch}" "${ARCHES[@]}" 'any' || return 1
@@ -305,7 +305,7 @@ check_pkgxbs() {
 	local xbsver="$(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; get_full_version "${_pkgname}")"
 	[ "${xbsver}" == "${_pkgver}" ] || return 1
 
-	local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo ${pkgname[@]}))
+	eval "local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
 	in_array "${_pkgname}" "${xbsnames[@]}" || return 1
 
 	return 0
@@ -331,7 +331,7 @@ check_splitpkgs() {
 		mkdir -p "${repo}/${_pkgarch}/${_pkgbase}"
 		echo "${_pkgname}" >> "${repo}/${_pkgarch}/${_pkgbase}/staging"
 
-		local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo ${pkgname[@]}))
+		eval "local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
 		for xbsname in "${xbsnames[@]}"; do
 			echo "${xbsname}" >> "${repo}/${_pkgarch}/${_pkgbase}/xbs"
 		done
diff --git a/db-move b/db-move
index 5fe9691..fe94883 100755
--- a/db-move
+++ b/db-move
@@ -29,7 +29,7 @@ for pkgbase in "${args[@]:2}"; do
 	for pkgarch in "${ARCHES[@]}" 'any'; do
 		xbsrepo_from="$(xbs releasepath ${pkgbase} ${repo_from} ${pkgarch})"
 		if [ -r "${xbsrepo_from}/PKGBUILD" ]; then
-			pkgnames=($(. "${xbsrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
+			eval "pkgnames=($(. "${xbsrepo_from}/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
 			if [ ${#pkgnames[@]} -lt 1 ]; then
 				die "Could not read pkgname"
 			fi
@@ -71,7 +71,7 @@ for pkgbase in "${args[@]:2}"; do
 			else
 				tarches=("${pkgarch}")
 			fi
-			pkgnames=($(. "${dir_to}/PKGBUILD"; echo ${pkgname[@]}))
+			eval "pkgnames=($(. "${dir_to}/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
 
 			for pkgname in "${pkgnames[@]}"; do
 				pkgver=$(. "${dir_to}/PKGBUILD"; get_full_version ${pkgname})
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"
diff --git a/test/lib/common.inc b/test/lib/common.inc
index 2f308dd..a241615 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -52,8 +52,8 @@ oneTimeSetUp() {
 	msg 'Building packages...'
 	for d in "${pkgdir}"/*; do
 		pushd $d >/dev/null
-		pkgname=($(. PKGBUILD; echo ${pkgname[@]}))
-		pkgarch=($(. PKGBUILD; echo ${arch[@]}))
+		eval "pkgname=($(. PKGBUILD; printf '%q ' "${pkgname[@]}"))"
+		eval "pkgarch=($(. PKGBUILD; printf '%q ' "${arch[@]}"))"
 		pkgversion=$(. PKGBUILD; get_full_version)
 
 		build=true
@@ -170,13 +170,13 @@ releasePackage() {
 	pushd "${TMP}/svn-packages-copy"/${pkgbase}/trunk/ >/dev/null
 	xbs release ${repo} ${arch} >/dev/null 2>&1
 	pkgver=$(. PKGBUILD; get_full_version)
-	pkgname=($(. PKGBUILD; echo ${pkgname[@]}))
+	eval "pkgname=($(. PKGBUILD; printf '%q ' "${pkgname[@]}"))"
 	popd >/dev/null
 	cp "${pkgdir}/${pkgbase}"/*-${pkgver}-${arch}${PKGEXT} "${STAGING}"/${repo}/
 
-	if ${REQUIRE_SIGNATURE}; then
-		for a in ${arch[@]}; do
-			for p in ${pkgname[@]}; do
+	if "${REQUIRE_SIGNATURE}"; then
+		for a in "${arch[@]}"; do
+			for p in "${pkgname[@]}"; do
 				signpkg "${STAGING}"/${repo}/${p}-${pkgver}-${a}${PKGEXT}
 			done
 		done
diff --git a/test/test.d/create-filelists.sh b/test/test.d/create-filelists.sh
index e78bde8..1126972 100755
--- a/test/test.d/create-filelists.sh
+++ b/test/test.d/create-filelists.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(readlink -e "$(dirname "$0")")"
 . "${curdir}/../lib/common.inc"
 
 testCreateSimpleFileLists() {
@@ -9,15 +9,15 @@ testCreateSimpleFileLists() {
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${arches[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${arches[@]}"; do
 			if ! bsdtar -xOf "${FTP_BASE}/extra/os/${arch}/extra${FILESEXT}" | grep "usr/bin/${pkgbase}" &>/dev/null; then
 				fail "usr/bin/${pkgbase} not found in ${arch}/extra${FILESEXT}"
 			fi
@@ -31,13 +31,13 @@ testCreateAnyFileLists() {
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase} any
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}" any
 	done
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${arches[@]}"; do
 			if ! bsdtar -xOf "${FTP_BASE}/extra/os/${arch}/extra${FILESEXT}" | grep "usr/share/${pkgbase}/test" &>/dev/null; then
 				fail "usr/share/${pkgbase}/test not found in ${arch}/extra${FILESEXT}"
 			fi
@@ -54,17 +54,17 @@ testCreateSplitFileLists() {
 	local pkgnames
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${arches[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		pkgnames=($(source "${TMP}/svn-packages-copy/${pkgbase}/trunk/PKGBUILD"; echo ${pkgname[@]}))
-		for pkgname in ${pkgnames[@]}; do
-			for arch in ${arches[@]}; do
+	for pkgbase in "${pkgs[@]}"; do
+		eval "pkgnames=($(source "${TMP}/svn-packages-copy/${pkgbase}/trunk/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
+		for pkgname in "${pkgnames[@]}"; do
+			for arch in "${arches[@]}"; do
 				if ! bsdtar -xOf "${FTP_BASE}/extra/os/${arch}/extra${FILESEXT}" | grep "usr/bin/${pkgname}" &>/dev/null; then
 					fail "usr/bin/${pkgname} not found in ${arch}/extra${FILESEXT}"
 				fi
-- 
cgit v1.2.3-54-g00ecf


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-functions   | 52 ++++++++++++++++++++++++++--------------------------
 db-move        | 34 +++++++++++++++++-----------------
 db-remove      | 16 ++++++++--------
 db-repo-add    | 26 +++++++++++++-------------
 db-repo-remove | 24 ++++++++++++------------
 5 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'db-move')

diff --git a/db-functions b/db-functions
index 006dde9..6e27148 100644
--- a/db-functions
+++ b/db-functions
@@ -40,7 +40,7 @@ script_lock() {
 	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
 		local _owner="$(/usr/bin/stat -c %U "$LOCKDIR")"
-		error "Script %s is already locked by $_owner." "${0##*/}"
+		error "Script %s is already locked by %s." "${0##*/}" "$_owner"
 		exit 1
 	else
 		set_umask
@@ -136,7 +136,7 @@ repo_lock () {
 	while [ "$_count" -le "$_trial" ] || "$_lockblock" ; do
 		if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
 			_owner="$(/usr/bin/stat -c %U "$LOCKDIR")"
-			warning "Repo [%s] (%s) is already locked by %s. " "${1}" "${2}" "$_owner"
+			warning "Repo [%s] (%s) is already locked by %s." "${1}" "${2}" "$_owner"
 			msg2 "Retrying in %d seconds..." "$LOCK_DELAY"
 		else
 			LOCKS+=("$1.$2")
@@ -239,10 +239,10 @@ getpkgfile() {
 		error 'No canonical package found!'
 		exit 1
 	elif [ ! -f "${1}" ]; then
-		error "Package ${1} not found!"
+		error "Package %s not found!" "${1}"
 		exit 1
 	elif "${REQUIRE_SIGNATURE}" && [ ! -f "${1}.sig" ]; then
-		error "Package signature ${1}.sig not found!"
+		error "Package signature %s not found!" "${1}.sig"
 		exit 1
 	fi
 
@@ -258,10 +258,10 @@ getpkgfiles() {
 
 	for f in "${@}"; do
 		if  [ ! -f "${f}" ]; then
-			error "Package ${f} not found!"
+			error "Package %s not found!" "${f}"
 			exit 1
 		elif "${REQUIRE_SIGNATURE}" && [ ! -f "${f}.sig" ]; then
-			error "Package signature ${f}.sig not found!"
+			error "Package signature %s not found!" "${f}.sig"
 			exit 1
 		fi
 	done
@@ -290,13 +290,13 @@ check_pkgfile() {
 
 check_pkgxbs() {
 	local pkgfile="${1}"
-	local _pkgbase="$(getpkgbase ${pkgfile})"
+	local _pkgbase="$(getpkgbase "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local _pkgname="$(getpkgname ${pkgfile})"
+	local _pkgname="$(getpkgname "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local _pkgver="$(getpkgver ${pkgfile})"
+	local _pkgver="$(getpkgver "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local _pkgarch="$(getpkgarch ${pkgfile})"
+	local _pkgarch="$(getpkgarch "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
 	local repo="${2}"
 
@@ -324,10 +324,10 @@ check_splitpkgs() {
 
 	for pkgfile in "${pkgfiles[@]}"; do
 		issplitpkg "${pkgfile}" || continue
-		local _pkgbase="$(getpkgbase ${pkgfile})"
+		local _pkgbase="$(getpkgbase "${pkgfile}")"
 		msg2 "Checking %s" "$_pkgbase"
-		local _pkgname="$(getpkgname ${pkgfile})"
-		local _pkgarch="$(getpkgarch ${pkgfile})"
+		local _pkgname="$(getpkgname "${pkgfile}")"
+		local _pkgarch="$(getpkgarch "${pkgfile}")"
 		mkdir -p "${repo}/${_pkgarch}/${_pkgbase}"
 		echo "${_pkgname}" >> "${repo}/${_pkgarch}/${_pkgbase}/staging"
 
@@ -353,11 +353,11 @@ check_splitpkgs() {
 check_pkgrepos() {
 	local pkgfile=$1
 
-	local pkgname="$(getpkgname ${pkgfile})"
+	local pkgname="$(getpkgname "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local pkgver="$(getpkgver ${pkgfile})"
+	local pkgver="$(getpkgver "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local pkgarch="$(getpkgarch ${pkgfile})"
+	local pkgarch="$(getpkgarch "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
 
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
@@ -389,11 +389,11 @@ check_repo_permission() {
 	[ -w "$FTP_BASE/${PKGPOOL}" ] || return 1
 
 	local arch
-	for arch in ${ARCHES}; do
+	for arch in "${ARCHES[@]}"; do
 		local dir="${FTP_BASE}/${repo}/os/${arch}/"
 		[ -w "${dir}" ] || return 1
-		[ -f "${dir}"${repo}${DBEXT} -a ! -w "${dir}"${repo}${DBEXT} ] && return 1
-		[ -f "${dir}"${repo}${FILESEXT} -a ! -w "${dir}"${repo}${FILESEXT} ] && return 1
+		[ -f "${dir}${repo}"${DBEXT} -a ! -w "${dir}${repo}"${DBEXT} ] && return 1
+		[ -f "${dir}${repo}"${FILESEXT} -a ! -w "${dir}${repo}"${FILESEXT} ] && return 1
 	done
 
 	return 0
@@ -407,12 +407,12 @@ set_repo_permission() {
 
 	if [ -w "${dbfile}" ]; then
 		local group=$(/usr/bin/stat --printf='%G' "$(dirname "${dbfile}")")
-		chgrp $group "${dbfile}" || error "Could not change group of ${dbfile} to $group"
-		chgrp $group "${filesfile}" || error "Could not change group of ${filesfile} to $group"
-		chmod g+w "${dbfile}" || error "Could not set write permission for group $group to ${dbfile}"
-		chmod g+w "${filesfile}" || error "Could not set write permission for group $group to ${filesfile}"
+		chgrp "$group" "${dbfile}" || error "Could not change group of %s to %s" "${dbfile}" "$group"
+		chgrp "$group" "${filesfile}" || error "Could not change group of %s to %s" "${filesfile}" "$group"
+		chmod g+w "${dbfile}" || error "Could not set write permission for group %s to %s" "$group" "${dbfile}"
+		chmod g+w "${filesfile}" || error "Could not set write permission for group %s to %s" "$group" "${filesfile}"
 	else
-		error "You don't have permission to change ${dbfile}"
+		error "You don't have permission to change %s" "${dbfile}"
 	fi
 }
 
@@ -424,9 +424,9 @@ arch_repo_add() {
 	# package files might be relative to repo dir
 	pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null
 	/usr/bin/repo-add -q "${repo}${DBEXT}" "${pkgs[@]}" >/dev/null \
-		|| error "repo-add ${repo}${DBEXT} ${pkgs[*]}"
+		|| error '%s' "repo-add ${repo}${DBEXT} ${pkgs[*]}"
 	/usr/bin/repo-add -f -q "${repo}${FILESEXT}" "${pkgs[@]}" \
-		|| error "repo-add -f ${repo}${FILESEXT} ${pkgs[*]}"
+		|| error '%s' "repo-add -f ${repo}${FILESEXT} ${pkgs[*]}"
 	popd >/dev/null
 	set_repo_permission "${repo}" "${arch}"
 
diff --git a/db-move b/db-move
index fe94883..f6588c3 100755
--- a/db-move
+++ b/db-move
@@ -4,7 +4,7 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
-	msg "usage: ${0##*/} <repo-from> <repo-to> <pkgname|pkgbase> ..."
+	msg "usage: %s <repo-from> <repo-to> <pkgname|pkgbase> ..." "${0##*/}"
 	exit 1
 fi
 
@@ -14,14 +14,14 @@ repo_to="${args[1]}"
 ftppath_from="${FTP_BASE}/${repo_from}/os/"
 ftppath_to="${FTP_BASE}/${repo_to}/os/"
 
-if ! check_repo_permission $repo_to || ! check_repo_permission $repo_from; then
+if ! check_repo_permission "$repo_to" || ! check_repo_permission "$repo_from"; then
 	die "You don't have permission to move packages from ${repo_from} to ${repo_to}"
 fi
 
 # TODO: this might lock too much (architectures)
 for pkgarch in "${ARCHES[@]}"; do
-	repo_lock ${repo_to} ${pkgarch} || exit 1
-	repo_lock ${repo_from} ${pkgarch} || exit 1
+	repo_lock "${repo_to}" "${pkgarch}" || exit 1
+	repo_lock "${repo_from}" "${pkgarch}" || exit 1
 done
 
 # First loop is to check that all necessary files exist
@@ -41,30 +41,30 @@ for pkgbase in "${args[@]:2}"; do
 			fi
 
 			for pkgname in "${pkgnames[@]}"; do
-				pkgver=$(. "${xbsrepo_from}/PKGBUILD"; get_full_version ${pkgname})
+				pkgver=$(. "${xbsrepo_from}/PKGBUILD"; get_full_version "${pkgname}")
 				if [ -z "${pkgver}" ]; then
 					die "Could not read pkgver"
 				fi
 				for tarch in "${tarches[@]}"; do
-					getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT} >/dev/null
+					getpkgfile "${ftppath_from}/${tarch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} >/dev/null
 				done
 			done
 			continue 2
 		fi
 	done
-	die "${pkgbase} not found in ${repo_from}"
+	die "%s not found in %s" "${pkgbase}" "${repo_from}"
 done
 
-msg "Moving packages from [${repo_from}] to [${repo_to}]..."
+msg "Moving packages from [%s] to [%s]..." "${repo_from}" "${repo_to}"
 
 declare -A add_pkgs
 declare -A remove_pkgs
 for pkgbase in "${args[@]:2}"; do
 	# move the package in xbs
-	arches=($(xbs move ${repo_from} ${repo_to} ${pkgbase}))
+	arches=($(xbs move "${repo_from}" "${repo_to}" "${pkgbase}"))
 	# move the package in ftp
 	for pkgarch in "${arches[@]}"; do
-		dir_to="$(xbs releasepath $pkgbase $repo_to $pkgarch)"
+		dir_to="$(xbs releasepath "$pkgbase" "$repo_to" "$pkgarch")"
 		if true; then # to add in indent level to make merging easier
 			if [ "${pkgarch}" == 'any' ]; then
 				tarches=("${ARCHES[@]}")
@@ -74,14 +74,14 @@ for pkgbase in "${args[@]:2}"; do
 			eval "pkgnames=($(. "${dir_to}/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
 
 			for pkgname in "${pkgnames[@]}"; do
-				pkgver=$(. "${dir_to}/PKGBUILD"; get_full_version ${pkgname})
+				pkgver=$(. "${dir_to}/PKGBUILD"; get_full_version "${pkgname}")
 				for tarch in "${tarches[@]}"; do
-					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT})
+					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT})
 					pkgfile="${pkgpath##*/}"
 
-					ln -s "../../../${PKGPOOL}/${pkgfile}" ${ftppath_to}/${tarch}/
-					if [ -f ${FTP_BASE}/${PKGPOOL}/${pkgfile}.sig ]; then
-						ln -s "../../../${PKGPOOL}/${pkgfile}.sig" ${ftppath_to}/${tarch}/
+					ln -s "../../../${PKGPOOL}/${pkgfile}" "${ftppath_to}/${tarch}/"
+					if [ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile}.sig" ]; then
+						ln -s "../../../${PKGPOOL}/${pkgfile}.sig" "${ftppath_to}/${tarch}/"
 					fi
 					add_pkgs[${tarch}]+="${FTP_BASE}/${PKGPOOL}/${pkgfile} "
 					remove_pkgs[${tarch}]+="${pkgname} "
@@ -99,6 +99,6 @@ for tarch in "${ARCHES[@]}"; do
 done
 
 for pkgarch in "${ARCHES[@]}"; do
-	repo_unlock ${repo_from} ${pkgarch}
-	repo_unlock ${repo_to} ${pkgarch}
+	repo_unlock "${repo_from}" "${pkgarch}"
+	repo_unlock "${repo_to}" "${pkgarch}"
 done
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
diff --git a/db-repo-add b/db-repo-add
index a6355a1..4611bdf 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -4,38 +4,38 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
-	msg "usage: ${0##*/} <repo> <arch> <pkgfile> ..."
+	msg "usage: %s <repo> <arch> <pkgfile> ..." "${0##*/}"
 	exit 1
 fi
 
 repo="$1"
 arch="$2"
-pkgfiles=(${@:3})
+pkgfiles=("${@:3}")
 
 ftppath="$FTP_BASE/$repo/os"
 
-if ! check_repo_permission $repo; then
-	die "You don't have permission to add packages to ${repo}"
+if ! check_repo_permission "$repo"; then
+	die "You don't have permission to add packages to %s" "${repo}"
 fi
 
 if [ "$arch" == "any" ]; then
-	tarches=(${ARCHES[@]})
+	tarches=("${ARCHES[@]}")
 else
 	tarches=("$arch")
 fi
 
-for tarch in ${tarches[@]}; do
-	repo_lock $repo $tarch || exit 1
+for tarch in "${tarches[@]}"; do
+	repo_lock "$repo" "$tarch" || exit 1
 done
 
-for tarch in ${tarches[@]}; do
-	for pkgfile in ${pkgfiles[@]}; do
+for tarch in "${tarches[@]}"; do
+	for pkgfile in "${pkgfiles[@]}"; do
 		if [[ ! -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}" ]]; then
-			die "Package file ${pkgfile##*/} not found in ${FTP_BASE}/${repo}/os/${arch}/"
+			die "Package file %s not found in %s" "${pkgfile##*/}" "${FTP_BASE}/${repo}/os/${arch}/"
 		else
-			msg "Adding $pkgfile to [$repo]..."
+			msg "Adding %s to [%s]..." "$pkgfile" "$repo"
 		fi
 	done
-	arch_repo_add "${repo}" "${tarch}" ${pkgfiles[@]}
-	repo_unlock $repo $tarch
+	arch_repo_add "${repo}" "${tarch}" "${pkgfiles[@]}"
+	repo_unlock "$repo" "$tarch"
 done
diff --git a/db-repo-remove b/db-repo-remove
index 7077d62..aadc4ce 100755
--- a/db-repo-remove
+++ b/db-repo-remove
@@ -4,34 +4,34 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
-	msg "usage: ${0##*/} <repo> <arch> <pkgname> ..."
+	msg "usage: %s <repo> <arch> <pkgname> ..." "${0##*/}"
 	exit 1
 fi
 
 repo="$1"
 arch="$2"
-pkgnames=(${@:3})
+pkgnames=("${@:3}")
 
 ftppath="$FTP_BASE/$repo/os"
 
-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
-	tarches=(${ARCHES[@]})
+	tarches=("${ARCHES[@]}")
 else
 	tarches=("$arch")
 fi
 
-for tarch in ${tarches[@]}; do
-	repo_lock $repo $tarch || exit 1
+for tarch in "${tarches[@]}"; do
+	repo_lock "$repo" "$tarch" || exit 1
 done
 
-for tarch in ${tarches[@]}; do
-	for pkgname in ${pkgnames[@]}; do
-		msg "Removing $pkgname from [$repo]..."
+for tarch in "${tarches[@]}"; do
+	for pkgname in "${pkgnames[@]}"; do
+		msg "Removing %s from [%s]..." "$pkgname" "$repo"
 	done
-	arch_repo_remove "${repo}" "${tarch}" ${pkgnames[@]}
-	repo_unlock $repo $tarch
+	arch_repo_remove "${repo}" "${tarch}" "${pkgnames[@]}"
+	repo_unlock "$repo" "$tarch"
 done
-- 
cgit v1.2.3-54-g00ecf


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

---
 cron-jobs/repo-sanity-check     | 2 +-
 db-functions                    | 4 ++--
 db-move                         | 4 ++--
 db-remove                       | 2 +-
 test/lib/common.inc             | 6 +++---
 test/test.d/create-filelists.sh | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'db-move')

diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 73ec171..fadb248 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -24,7 +24,7 @@ for _repo in "${PKGREPOS[@]}"; do
 				done
 
 				# this fills the on_abs array
-				printf '%q ' "${pkgname[@]}"
+				echo "${pkgname[@]}"
 			done
 			))
 
diff --git a/db-functions b/db-functions
index ebf1d47..f703386 100644
--- a/db-functions
+++ b/db-functions
@@ -305,7 +305,7 @@ check_pkgxbs() {
 	local xbsver="$(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; get_full_version "${_pkgname}")"
 	[ "${xbsver}" == "${_pkgver}" ] || return 1
 
-	eval "local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
+	local xbsnames=($(. "$(xbs releasepath "${_pkgbase}" "${repo}" "${_pkgarch}")/PKGBUILD"; echo "${pkgname[@]}"))
 	in_array "${_pkgname}" "${xbsnames[@]}" || return 1
 
 	return 0
@@ -331,7 +331,7 @@ check_splitpkgs() {
 		mkdir -p "${repo}/${_pkgarch}/${_pkgbase}"
 		echo "${_pkgname}" >> "${repo}/${_pkgarch}/${_pkgbase}/staging"
 
-		eval "local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
+		local xbsnames=($(. "$(xbs releasepath "${_pkgbase}" "${repo}" "${_pkgarch}")/PKGBUILD"; echo "${pkgname[@]}"))
 		for xbsname in "${xbsnames[@]}"; do
 			echo "${xbsname}" >> "${repo}/${_pkgarch}/${_pkgbase}/xbs"
 		done
diff --git a/db-move b/db-move
index f6588c3..4624d75 100755
--- a/db-move
+++ b/db-move
@@ -29,7 +29,7 @@ for pkgbase in "${args[@]:2}"; do
 	for pkgarch in "${ARCHES[@]}" 'any'; do
 		xbsrepo_from="$(xbs releasepath ${pkgbase} ${repo_from} ${pkgarch})"
 		if [ -r "${xbsrepo_from}/PKGBUILD" ]; then
-			eval "pkgnames=($(. "${xbsrepo_from}/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
+			pkgnames=($(. "${xbsrepo_from}/PKGBUILD"; echo "${pkgname[@]}"))
 			if [ ${#pkgnames[@]} -lt 1 ]; then
 				die "Could not read pkgname"
 			fi
@@ -71,7 +71,7 @@ for pkgbase in "${args[@]:2}"; do
 			else
 				tarches=("${pkgarch}")
 			fi
-			eval "pkgnames=($(. "${dir_to}/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
+			pkgnames=($(. "${dir_to}/PKGBUILD"; echo "${pkgname[@]}"))
 
 			for pkgname in "${pkgnames[@]}"; do
 				pkgver=$(. "${dir_to}/PKGBUILD"; get_full_version "${pkgname}")
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"
diff --git a/test/lib/common.inc b/test/lib/common.inc
index a241615..1feb1bb 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -52,8 +52,8 @@ oneTimeSetUp() {
 	msg 'Building packages...'
 	for d in "${pkgdir}"/*; do
 		pushd $d >/dev/null
-		eval "pkgname=($(. PKGBUILD; printf '%q ' "${pkgname[@]}"))"
-		eval "pkgarch=($(. PKGBUILD; printf '%q ' "${arch[@]}"))"
+		pkgname=($(. PKGBUILD; echo "${pkgname[@]}"))
+		pkgarch=($(. PKGBUILD; echo "${arch[@]}"))
 		pkgversion=$(. PKGBUILD; get_full_version)
 
 		build=true
@@ -170,7 +170,7 @@ releasePackage() {
 	pushd "${TMP}/svn-packages-copy"/${pkgbase}/trunk/ >/dev/null
 	xbs release ${repo} ${arch} >/dev/null 2>&1
 	pkgver=$(. PKGBUILD; get_full_version)
-	eval "pkgname=($(. PKGBUILD; printf '%q ' "${pkgname[@]}"))"
+	pkgname=($(. PKGBUILD; echo "${pkgname[@]}"))
 	popd >/dev/null
 	cp "${pkgdir}/${pkgbase}"/*-${pkgver}-${arch}${PKGEXT} "${STAGING}"/${repo}/
 
diff --git a/test/test.d/create-filelists.sh b/test/test.d/create-filelists.sh
index 1126972..b5ec5c8 100755
--- a/test/test.d/create-filelists.sh
+++ b/test/test.d/create-filelists.sh
@@ -62,7 +62,7 @@ testCreateSplitFileLists() {
 	../db-update
 
 	for pkgbase in "${pkgs[@]}"; do
-		eval "pkgnames=($(source "${TMP}/svn-packages-copy/${pkgbase}/trunk/PKGBUILD"; printf '%q ' "${pkgname[@]}"))"
+		pkgnames=($(source "${TMP}/svn-packages-copy/${pkgbase}/trunk/PKGBUILD"; echo "${pkgname[@]}"))
 		for pkgname in "${pkgnames[@]}"; do
 			for arch in "${arches[@]}"; do
 				if ! bsdtar -xOf "${FTP_BASE}/extra/os/${arch}/extra${FILESEXT}" | grep "usr/bin/${pkgname}" &>/dev/null; then
-- 
cgit v1.2.3-54-g00ecf


From 7d061a7e0faa365ae2448154c010eed26409713d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 11:58:49 -0400
Subject: more quoting an printf fixes

---
 db-cleanup          |  2 +-
 db-functions        | 15 ++++++-------
 db-move             |  2 +-
 db-update           | 36 +++++++++++++++----------------
 test/lib/common.inc | 62 ++++++++++++++++++++++++++---------------------------
 5 files changed, 58 insertions(+), 59 deletions(-)

(limited to 'db-move')

diff --git a/db-cleanup b/db-cleanup
index cc0a5b4..413ce06 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -29,7 +29,7 @@ EXTRAFLAGS=()
 "${CLEANUP_DRYRUN}" && EXTRAFLAGS+=(--dry-run)
 
 filter=$(mktemp -t "${0##*/}.XXXXXXXXXX")
-trap "rm $(printf %q "$filter")" EXIT
+trap "rm -f -- $(printf %q "$filter")" EXIT
 
 for _repo in "${PKGREPOS[@]}"; do
 	for _arch in "${ARCHES[@]}"; do
diff --git a/db-functions b/db-functions
index f703386..a1e86d9 100644
--- a/db-functions
+++ b/db-functions
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Some PKGBUILDs need CARCH to be set
-CARCH=$(. $(librelib conf.sh); load_files makepkg; echo $CARCH)
+CARCH=$(. "$(librelib conf.sh)"; load_files makepkg; echo "$CARCH")
 
 # Useful functions
 UMASK=""
@@ -251,7 +251,7 @@ getpkgfile() {
 
 getpkgfiles() {
 	local f
-	if [ ! -z "$(echo ${@%\.*} | sed "s/ /\n/g" | sort | uniq -D)" ]; then
+	if [ ! -z "$(printf '%s\n' "${@%\.*}" | sort | uniq -D)" ]; then
 		error 'Duplicate packages found!'
 		exit 1
 	fi
@@ -302,7 +302,7 @@ check_pkgxbs() {
 
 	in_array "${repo}" "${PKGREPOS[@]}" || return 1
 
-	local xbsver="$(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; get_full_version "${_pkgname}")"
+	local xbsver="$(. "$(xbs releasepath "${_pkgbase}" "${repo}" "${_pkgarch}")/PKGBUILD"; get_full_version "${_pkgname}")"
 	[ "${xbsver}" == "${_pkgver}" ] || return 1
 
 	local xbsnames=($(. "$(xbs releasepath "${_pkgbase}" "${repo}" "${_pkgarch}")/PKGBUILD"; echo "${pkgname[@]}"))
@@ -332,8 +332,7 @@ check_splitpkgs() {
 		echo "${_pkgname}" >> "${repo}/${_pkgarch}/${_pkgbase}/staging"
 
 		local xbsnames=($(. "$(xbs releasepath "${_pkgbase}" "${repo}" "${_pkgarch}")/PKGBUILD"; echo "${pkgname[@]}"))
-		for xbsname in "${xbsnames[@]}"; do
-			echo "${xbsname}" >> "${repo}/${_pkgarch}/${_pkgbase}/xbs"
+		printf '%s\n' "${xbsnames[@]}" >> "${repo}/${_pkgarch}/${_pkgbase}/xbs"
 		done
 	done
 	popd >/dev/null
@@ -441,13 +440,13 @@ arch_repo_remove() {
 	local filesfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${FILESEXT}"
 
 	if [ ! -f "${dbfile}" ]; then
-		error "No database found at '${dbfile}'"
+		error "No database found at '%s'" "${dbfile}"
 		return 1
 	fi
 	/usr/bin/repo-remove -q "${dbfile}" "${pkgs[@]}" >/dev/null \
-		|| error "repo-remove ${dbfile} ${pkgs[*]}"
+		|| error '%s' "repo-remove ${dbfile} ${pkgs[*]}"
 	/usr/bin/repo-remove -q "${filesfile}" "${pkgs[@]}" \
-		|| error "repo-remove ${filesfile} ${pkgs[*]}"
+		|| error '%s' "repo-remove ${filesfile} ${pkgs[*]}"
 	set_repo_permission "${repo}" "${arch}"
 
 	REPO_MODIFIED=1
diff --git a/db-move b/db-move
index 4624d75..2c7c19e 100755
--- a/db-move
+++ b/db-move
@@ -15,7 +15,7 @@ ftppath_from="${FTP_BASE}/${repo_from}/os/"
 ftppath_to="${FTP_BASE}/${repo_to}/os/"
 
 if ! check_repo_permission "$repo_to" || ! check_repo_permission "$repo_from"; then
-	die "You don't have permission to move packages from ${repo_from} to ${repo_to}"
+	die "You don't have permission to move packages from %s to %s" "${repo_from}" "${repo_to}"
 fi
 
 # TODO: this might lock too much (architectures)
diff --git a/db-update b/db-update
index f830e11..9a52e01 100755
--- a/db-update
+++ b/db-update
@@ -6,18 +6,18 @@
 shopt -s nullglob
 
 if [ $# -ge 1 ]; then
-	warning "Calling ${0##*/} with a specific repository is no longer supported"
+	warning "Calling %s with a specific repository is no longer supported" "${0##*/}"
 	exit 1
 fi
 
 # Find repos with packages to release
 staging_repos=($(find  "${STAGING}" -mindepth 1 -type f -name "*${PKGEXT}" -printf '%h\n' | sort -u))
 if [ $? -ge 1 ]; then
-	die "Could not read ${STAGING}"
+	die "Could not read %s" "${STAGING}"
 fi
 
 repos=()
-for staging_repo in ${staging_repos[@]##*/}; do
+for staging_repo in "${staging_repos[@]##*/}"; do
 	if in_array "${staging_repo}" "${PKGREPOS[@]}"; then
 		repos+=("${staging_repo}")
 	fi
@@ -26,7 +26,7 @@ done
 # 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
 
@@ -35,42 +35,42 @@ for repo in "${repos[@]}"; do
 	pkgs=($(getpkgfiles "${STAGING}/${repo}/"*${PKGEXT}))
 	if [ $? -eq 0 ]; then
 		if [ ${#pkgs[@]} -gt 0 ] && ! check_repo_permission "${repo}"; then
-			die "You don't have permission to update packages in ${repo}"
+			die "You don't have permission to update packages in %s" "${repo}"
 		fi
 		for pkg in "${pkgs[@]}"; do
 			if [ -h "${pkg}" ]; then
-				die "Package ${repo}/${pkg##*/} is a symbolic link"
+				die "Package %s is a symbolic link" "${repo}/${pkg##*/}"
 			fi
 			if ! check_pkgfile "${pkg}"; then
-				die "Package ${repo}/${pkg##*/} is not consistent with its meta data"
+				die "Package %s is not consistent with its meta data" "${repo}/${pkg##*/}"
 			fi
-			if ${REQUIRE_SIGNATURE} && ! pacman-key -v "${pkg}.sig" >/dev/null 2>&1; then
-				die "Package ${repo}/${pkg##*/} does not have a valid signature"
+			if "${REQUIRE_SIGNATURE}" && ! pacman-key -v "${pkg}.sig" >/dev/null 2>&1; then
+				die "Package %s does not have a valid signature" "${repo}/${pkg##*/}"
 			fi
 			if ! check_pkgxbs "${pkg}" "${repo}"; then
-				die "Package ${repo}/${pkg##*/} is not consistent with xbs"
+				die "Package %s is not consistent with XBS" "${repo}/${pkg##*/}"
 			fi
 			if ! check_pkgrepos "${pkg}"; then
-				die "Package ${repo}/${pkg##*/} already exists in another repository"
+				die "Package %s already exists in another repository" "${repo}/${pkg##*/}"
 			fi
 		done
-		if ! check_splitpkgs ${repo} ${pkgs[@]}; then
-			die "Missing split packages for ${repo}"
+		if ! check_splitpkgs "${repo}" "${pkgs[@]}"; then
+			die "Missing split packages for %s" "${repo}"
 		fi
 	else
-		die "Could not read ${STAGING}"
+		die "Could not read %s" "${STAGING}"
 	fi
 done
 
 for repo in "${repos[@]}"; do
-	msg "Updating [${repo}]..."
+	msg "Updating [%s]..." "${repo}"
 	any_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-any${PKGEXT} 2>/dev/null))
 	for pkgarch in "${ARCHES[@]}"; do
 		add_pkgs=()
-		arch_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-${pkgarch}${PKGEXT} 2>/dev/null))
+		arch_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-"${pkgarch}"${PKGEXT} 2>/dev/null))
 		for pkg in "${arch_pkgs[@]}" "${any_pkgs[@]}"; do
 			pkgfile="${pkg##*/}"
-			msg2 "${pkgfile} (${pkgarch})"
+			msg2 "%s (%s)" "${pkgfile}" "${pkgarch}"
 			# any packages might have been moved by the previous run
 			if [ -f "${pkg}" ]; then
 				mv "${pkg}" "$FTP_BASE/${PKGPOOL}"
@@ -93,7 +93,7 @@ done
 
 for repo in "${repos[@]}"; do
 	for pkgarch in "${ARCHES[@]}"; do
-		repo_unlock ${repo} ${pkgarch}
+		repo_unlock "${repo}" "${pkgarch}"
 	done
 done
 
diff --git a/test/lib/common.inc b/test/lib/common.inc
index 1feb1bb..b9a2f9d 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -33,9 +33,9 @@ signpkg() {
 		. ~/.makepkg.conf
 	fi
 	if [[ -n $GPGKEY ]]; then
-		SIGNWITHKEY="-u ${GPGKEY}"
+		SIGNWITHKEY=(-u "${GPGKEY}")
 	fi
-	gpg --detach-sign --use-agent ${SIGNWITHKEY} ${@} || die
+	gpg --detach-sign --use-agent "${SIGNWITHKEY[@]}" "${@}" || die
 }
 
 oneTimeSetUp() {
@@ -47,8 +47,8 @@ oneTimeSetUp() {
 	local pkgarch
 	local pkgversion
 	local build
-	pkgdir="$(mktemp -dqt ${0##*/}.XXXXXXXXXX)"
-	cp -Lr $(dirname ${BASH_SOURCE[0]})/../packages/* "${pkgdir}"
+	pkgdir="$(mktemp -dt "${0##*/}.XXXXXXXXXX")"
+	cp -Lr "$(dirname "${BASH_SOURCE[0]}")"/../packages/* "${pkgdir}"
 	msg 'Building packages...'
 	for d in "${pkgdir}"/*; do
 		pushd $d >/dev/null
@@ -57,21 +57,21 @@ oneTimeSetUp() {
 		pkgversion=$(. PKGBUILD; get_full_version)
 
 		build=true
-		for a in ${pkgarch[@]}; do
-			for p in ${pkgname[@]}; do
-				[ ! -f ${p}-${pkgversion}-${a}${PKGEXT} ] && build=false
+		for a in "${pkgarch[@]}"; do
+			for p in "${pkgname[@]}"; do
+				[ ! -f "${p}-${pkgversion}-${a}"${PKGEXT} ] && build=false
 			done
 		done
 
-		if ! ${build}; then
+		if ! "${build}"; then
 			if [ "${pkgarch[0]}" == 'any' ]; then
-				sudo libremakepkg || die 'libremakepkg failed'
+				sudo libremakepkg || die 'libremakepkg failed' 
 			else
-				for a in ${pkgarch[@]}; do
-					if in_array $a ${arches[@]}; then
-						sudo setarch $a libremakepkg -n $a || die "setarch ${a} libremakepkg -n ${a} failed"
-						for p in ${pkgname[@]}; do
-							cp ${p}-${pkgversion}-${a}${PKGEXT} $(dirname ${BASH_SOURCE[0]})/../packages/${d##*/}
+				for a in "${pkgarch[@]}"; do
+					if in_array "$a" "${arches[@]}"; then
+						sudo setarch "$a" libremakepkg -n "$a" || die "setarch ${a} libremakepkg -n ${a} failed"
+						for p in "${pkgname[@]}"; do
+							cp "${p}-${pkgversion}-${a}"${PKGEXT} "$(dirname "${BASH_SOURCE[0]})/../packages/${d##*/}")"
 						done
 					else
 						warning "skipping arch %s" "$a"
@@ -93,9 +93,9 @@ setUp() {
 	local r
 	local a
 
-	[ -f "$(dirname ${BASH_SOURCE[0]})/../../config.local" ] && die "$(dirname ${BASH_SOURCE[0]})/../../config.local exists"
+	[ -f "$(dirname "${BASH_SOURCE[0]}")/../../config.local" ] && die "$(dirname "${BASH_SOURCE[0]}")/../../config.local exists"
 	init_tmpdir
-	TMP="$(mktemp -dqt ${0##*/}.XXXXXXXXXX)"
+	TMP="$(mktemp -dt "${0##*/}.XXXXXXXXXX")"
 	#msg "Using ${TMP}"
 
 	PKGREPOS=('core' 'extra' 'testing')
@@ -103,9 +103,9 @@ setUp() {
 	SRCPOOL='pool/sources'
 	mkdir -p "${TMP}/"{ftp,tmp,staging,{package,source}-cleanup,svn-packages-{copy,repo}}
 
-	for r in ${PKGREPOS[@]}; do
+	for r in "${PKGREPOS[@]}"; do
 		mkdir -p "${TMP}/staging/${r}"
-		for a in ${ARCHES[@]}; do
+		for a in "${ARCHES[@]}"; do
 			mkdir -p "${TMP}/ftp/${r}/os/${a}"
 		done
 	done
@@ -119,8 +119,8 @@ setUp() {
 	for p in "${pkgdir}"/*; do
 		pkg=${p##*/}
 		mkdir -p "${TMP}/svn-packages-copy/${pkg}"/{trunk,repos}
-		cp "${p}"/* "${TMP}/svn-packages-copy"/${pkg}/trunk/
-		arch_svn add -q "${TMP}/svn-packages-copy"/${pkg}
+		cp "${p}"/* "${TMP}/svn-packages-copy/${pkg}/trunk/"
+		arch_svn add -q "${TMP}/svn-packages-copy/${pkg}"
 		arch_svn commit -q -m"initial commit of ${pkg}" "${TMP}/svn-packages-copy"
 	done
 
@@ -130,13 +130,13 @@ setUp() {
 		'SVNURL=foo' \
 		"SVNREPO=\"${TMP}/svn-packages-copy\"" \
 		"ARCHES=($(arches))" \
-		> $XDG_CONFIG_HOME/libretools/xbs-abs.conf
-	printf '%s\n' 'BUILDSYSTEM=abs' > $XDG_CONFIG_HOME/xbs.conf
+		> "$XDG_CONFIG_HOME/libretools/xbs-abs.conf"
+	printf '%s\n' 'BUILDSYSTEM=abs' > "$XDG_CONFIG_HOME/xbs.conf"
 
-	cat <<eot > "$(dirname ${BASH_SOURCE[0]})/../../config.local"
+	cat <<eot > "$(dirname "${BASH_SOURCE[0]}")/../../config.local"
 	FTP_BASE="${TMP}/ftp"
 	SVNREPO="${TMP}/svn-packages-copy"
-	PKGREPOS=(${PKGREPOS[@]})
+	PKGREPOS=("${PKGREPOS[@]}")
 	PKGPOOL="${PKGPOOL}"
 	SRCPOOL="${SRCPOOL}"
 	TESTING_REPO='testing'
@@ -149,12 +149,12 @@ setUp() {
 	SOURCE_CLEANUP_DRYRUN=false
 	REQUIRE_SIGNATURE=true
 eot
-	. "$(dirname ${BASH_SOURCE[0]})/../../config"
+	. "$(dirname "${BASH_SOURCE[0]}")/../../config"
 }
 
 tearDown() {
 	rm -rf "${TMP}"
-	rm -f "$(dirname ${BASH_SOURCE[0]})/../../config.local"
+	rm -f "$(dirname "${BASH_SOURCE[0]}")/../../config.local"
 	echo
 }
 
@@ -167,17 +167,17 @@ releasePackage() {
 	local pkgver
 	local pkgname
 
-	pushd "${TMP}/svn-packages-copy"/${pkgbase}/trunk/ >/dev/null
-	xbs release ${repo} ${arch} >/dev/null 2>&1
+	pushd "${TMP}/svn-packages-copy/${pkgbase}/trunk/" >/dev/null
+	xbs release "${repo}" "${arch}" >/dev/null 2>&1
 	pkgver=$(. PKGBUILD; get_full_version)
 	pkgname=($(. PKGBUILD; echo "${pkgname[@]}"))
 	popd >/dev/null
-	cp "${pkgdir}/${pkgbase}"/*-${pkgver}-${arch}${PKGEXT} "${STAGING}"/${repo}/
+	cp "${pkgdir}/${pkgbase}"/*-"${pkgver}-${arch}"${PKGEXT} "${STAGING}/${repo}/"
 
 	if "${REQUIRE_SIGNATURE}"; then
 		for a in "${arch[@]}"; do
 			for p in "${pkgname[@]}"; do
-				signpkg "${STAGING}"/${repo}/${p}-${pkgver}-${a}${PKGEXT}
+				signpkg "${STAGING}/${repo}/${p}-${pkgver}-${a}"${PKGEXT}
 			done
 		done
 	fi
@@ -190,7 +190,7 @@ checkAnyPackageDB() {
 	local db
 
 	[ -r "${FTP_BASE}/${PKGPOOL}/${pkg}" ] || fail "${PKGPOOL}/${pkg} not found"
-	if ${REQUIRE_SIGNATURE}; then
+	if "${REQUIRE_SIGNATURE}"; then
 		[ -r "${FTP_BASE}/${PKGPOOL}/${pkg}.sig" ] || fail "${PKGPOOL}/${pkg}.sig not found"
 	fi
 
-- 
cgit v1.2.3-54-g00ecf


From 6b162f5156f1456541c160233b6a2145df500898 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 21:43:43 -0400
Subject: db-move: fix some quoting

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

(limited to 'db-move')

diff --git a/db-move b/db-move
index 2c7c19e..f48ce4f 100755
--- a/db-move
+++ b/db-move
@@ -27,7 +27,7 @@ done
 # First loop is to check that all necessary files exist
 for pkgbase in "${args[@]:2}"; do
 	for pkgarch in "${ARCHES[@]}" 'any'; do
-		xbsrepo_from="$(xbs releasepath ${pkgbase} ${repo_from} ${pkgarch})"
+		xbsrepo_from="$(xbs releasepath "${pkgbase}" "${repo_from}" "${pkgarch}")"
 		if [ -r "${xbsrepo_from}/PKGBUILD" ]; then
 			pkgnames=($(. "${xbsrepo_from}/PKGBUILD"; echo "${pkgname[@]}"))
 			if [ ${#pkgnames[@]} -lt 1 ]; then
-- 
cgit v1.2.3-54-g00ecf


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-move   | 9 +++++----
 db-remove | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index f48ce4f..89a0ad6 100755
--- a/db-move
+++ b/db-move
@@ -64,17 +64,18 @@ for pkgbase in "${args[@]:2}"; do
 	arches=($(xbs move "${repo_from}" "${repo_to}" "${pkgbase}"))
 	# move the package in ftp
 	for pkgarch in "${arches[@]}"; do
-		dir_to="$(xbs releasepath "$pkgbase" "$repo_to" "$pkgarch")"
-		if true; then # to add in indent level to make merging easier
+		xbsrepo_to="$(xbs releasepath "$pkgbase" "$repo_to" "$pkgarch")"
+		if true; then # to add an indent level to make merging easier
 			if [ "${pkgarch}" == 'any' ]; then
 				tarches=("${ARCHES[@]}")
 			else
 				tarches=("${pkgarch}")
 			fi
-			pkgnames=($(. "${dir_to}/PKGBUILD"; echo "${pkgname[@]}"))
+			msg2 "%s (%s)" "${pkgbase}" "${tarches[*]}"
+			pkgnames=($(. "${xbsrepo_to}/PKGBUILD"; echo "${pkgname[@]}"))
 
 			for pkgname in "${pkgnames[@]}"; do
-				pkgver=$(. "${dir_to}/PKGBUILD"; get_full_version "${pkgname}")
+				pkgver=$(. "${xbsrepo_to}/PKGBUILD"; get_full_version "${pkgname}")
 				for tarch in "${tarches[@]}"; do
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT})
 					pkgfile="${pkgpath##*/}"
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-54-g00ecf