Clean up quoting.

8 files changed, 56 insertions, 58 deletions

diff --git a/cron-jobs/check_archlinux/parse_pkgbuilds.sh b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
index 9b26f1e..b857ac8 100755
--- a/cron-jobs/check_archlinux/parse_pkgbuilds.sh
+++ b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
@@ -12,7 +12,7 @@ readonly -a variables splitpkg_overrides
 backup_package_variables() {
 	for var in "${splitpkg_overrides[@]}"; do
 		indirect="${var}_backup"
-		eval "${indirect}=(\${$var[@]})"
+		eval "${indirect}=(\"\${$var[@]}\")"
 	done
 }
 
@@ -20,9 +20,9 @@ restore_package_variables() {
 	for var in "${splitpkg_overrides[@]}"; do
 		indirect="${var}_backup"
 		if [ -n "${!indirect}" ]; then
-			eval "${var}=(\${$indirect[@]})"
+			eval "${var}=(\"\${$indirect[@]}\")"
 		else
-			unset ${var}
+			unset "${var}"
 		fi
 	done
 }
@@ -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
-			echo $i
+			echo "$i"
 		done
 		echo ""
 	fi
 	if [ -n "$makedepends" ]; then
 		echo "%MAKEDEPENDS%"
 		for i in "${makedepends[@]}"; do
-			echo $i
+			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
 }
@@ -76,9 +76,9 @@ source_pkgbuild() {
 	dir=$1
 	pkgbuild=$dir/PKGBUILD
 	for var in "${variables[@]}"; do
-		unset ${var}
+		unset "${var}"
 	done
-	source $pkgbuild &>/dev/null || ret=$?
+	source "$pkgbuild" &>/dev/null || ret=$?
 
 	# ensure $pkgname and $pkgver variables were found
 	if [ $ret -ne 0 -o -z "$pkgname" -o -z "$pkgver" ]; then
@@ -89,7 +89,7 @@ source_pkgbuild() {
 	if [ "${#pkgname[@]}" -gt "1" ]; then
 		pkgbase=${pkgbase:-${pkgname[0]}}
 		for pkg in "${pkgname[@]}"; do
-			if [ "$(type -t package_${pkg})" != "function" ]; then
+			if [ "$(type -t "package_${pkg}")" != "function" ]; then
 				echo -e "%INVALID%\n$pkgbuild\n"
 				return 1
 			else
@@ -104,7 +104,7 @@ source_pkgbuild() {
 							break
 						fi
 					done
-				done < <(type package_${pkg})
+				done < <(type "package_${pkg}")
 				print_info
 				restore_package_variables
 			fi
@@ -124,14 +124,14 @@ find_pkgbuilds() {
 		return
 	fi
 
-	if [ -f $1/PKGBUILD ]; then
-		source_pkgbuild $1
+	if [ -f "$1/PKGBUILD" ]; then
+		source_pkgbuild "$1"
 		return
 	fi
 	empty=1
-	for dir in $1/*; do
-		if [ -d $dir ]; then
-			find_pkgbuilds $dir
+	for dir in "$1"/*; do
+		if [ -d "$dir" ]; then
+			find_pkgbuilds "$dir"
 			unset empty
 		fi
 	done
@@ -147,7 +147,7 @@ fi
 CARCH=$1
 shift
 for dir in "$@"; do
-	find_pkgbuilds $dir
+	find_pkgbuilds "$dir"
 done
 
 exit 0
diff --git a/cron-jobs/devlist-mailer b/cron-jobs/devlist-mailer
index 32896f7..1a05521 100755
--- a/cron-jobs/devlist-mailer
+++ b/cron-jobs/devlist-mailer
@@ -23,6 +23,6 @@ if [ -n "$(echo $stdin)" ]; then
 To: $LIST
 From: $FROM
 
-$stdin" | /usr/sbin/sendmail -F$FROM "$LIST"
+$stdin" | /usr/sbin/sendmail -F"$FROM" "$LIST"
 
 fi
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index f2d8b33..d5a277b 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -7,7 +7,7 @@ clean_pkg() {
 	local pkg
 	local target
 
-	if ! ${CLEANUP_DRYRUN}; then
+	if ! "${CLEANUP_DRYRUN}"; then
 		for pkg in "$@"; do
 			if [ -h "$pkg" ]; then
 				rm -f "$pkg" "$pkg.sig"
@@ -22,8 +22,7 @@ clean_pkg() {
 	fi
 }
 
-
-${CLEANUP_DRYRUN} && warning 'dry run mode is active'
+"${CLEANUP_DRYRUN}" && warning 'dry run mode is active'
 
 for repo in "${PKGREPOS[@]}"; do
 	for arch in "${ARCHES[@]}"; do
@@ -38,7 +37,7 @@ for repo in "${PKGREPOS[@]}"; do
 		missing_pkgs=($(comm -13 "${WORKDIR}/repo-${repo}-${arch}" "${WORKDIR}/db-${repo}-${arch}"))
 		if [ ${#missing_pkgs[@]} -ge 1 ]; then
 			error "Missing packages in [${repo}] (${arch})..."
-			for missing_pkg in ${missing_pkgs[@]}; do
+			for missing_pkg in "${missing_pkgs[@]}"; do
 				msg2 "${missing_pkg}"
 			done
 		fi
@@ -46,7 +45,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
@@ -62,18 +61,18 @@ cat "${WORKDIR}/db-"* | sort -u > "${WORKDIR}/db"
 old_pkgs=($(comm -23 "${WORKDIR}/pool" "${WORKDIR}/db"))
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old packages from package pool..."
-	for old_pkg in ${old_pkgs[@]}; do
+	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 "${old_pkg}"
 		clean_pkg "$FTP_BASE/${PKGPOOL}/${old_pkg}"
 	done
 fi
 
-old_pkgs=($(find ${CLEANUP_DESTDIR} -type f -name "*${PKGEXT}" -mtime +${CLEANUP_KEEP} -printf '%f\n'))
+old_pkgs=($(find "${CLEANUP_DESTDIR}" -type f -name "*${PKGEXT}" -mtime +"${CLEANUP_KEEP}" -printf '%f\n'))
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old packages from the cleanup directory..."
-	for old_pkg in ${old_pkgs[@]}; do
+	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 "${old_pkg}"
-		if ! ${CLEANUP_DRYRUN}; then
+		if ! "${CLEANUP_DRYRUN}"; then
 			rm -f "${CLEANUP_DESTDIR}/${old_pkg}"
 			rm -f "${CLEANUP_DESTDIR}/${old_pkg}.sig"
 		fi
@@ -82,7 +81,7 @@ fi
 
 for repo in "${PKGREPOS[@]}"; do
 	for arch in "${ARCHES[@]}"; do
-		repo_unlock ${repo} ${arch}
+		repo_unlock "${repo}" "${arch}"
 	done
 done
 
diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check
index 86a8f1d..33a4eb6 100755
--- a/cron-jobs/integrity-check
+++ b/cron-jobs/integrity-check
@@ -13,12 +13,12 @@ fi
 mailto=$1
 
 check() {
-	${dirname}/check_archlinux/check_packages.py \
+	"${dirname}"/check_archlinux/check_packages.py \
 		--repos="${repos}" \
 		--abs-tree="/srv/abs/rsync/${arch},/srv/abs/rsync/any" \
 		--repo-dir="${FTP_BASE}" \
 		--arch="${arch}" \
-	2>&1 | ${dirname}/devlist-mailer "Integrity Check ${arch}: ${repos}" "${mailto}"
+	2>&1 | "${dirname}"/devlist-mailer "Integrity Check ${arch}: ${repos}" "${mailto}"
 }
 
 repos='core,extra,community'
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index f5f80c8..105bac4 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -10,9 +10,9 @@ for _repo in "${PKGREPOS[@]}"; do
 
 	# Find all pkgnames on this repo's abs
 	on_abs=($(
-			find ${SVNREPO}/${_repo} -name PKGBUILD | \
+			find "${SVNREPO}/${_repo}" -name PKGBUILD | \
 				while read pkgbuild; do
-				source ${pkgbuild} >/dev/null 2>&1
+				source "${pkgbuild}" >/dev/null 2>&1
 				# cleanup to save memory
 				unset build package source md5sums pkgdesc pkgver pkgrel epoch \
 					url license arch depends makedepends optdepends options \
@@ -20,11 +20,11 @@ for _repo in "${PKGREPOS[@]}"; do
 
 				# also cleanup package functions
 				for _pkg in "${pkgname[@]}"; do
-					unset package_${pkg} >/dev/null 2>&1
+					unset "package_${pkg}" >/dev/null 2>&1
 				done
 				
 				# this fills the on_abs array
-				echo ${pkgname[@]}
+				echo "${pkgname[@]}"
 			done
 			))
 
@@ -36,20 +36,21 @@ for _repo in "${PKGREPOS[@]}"; do
 
 	# Find all pkgnames on repos
 	on_repo=($(
-			find ${FTP_BASE}/${_repo} -name "*.pkg.tar.?z" -printf "%f\n" | \
-				sed "s/^\(.\+\)-[^-]\+-[^-]\+-[^-]\+$/\1/"
+			find "${FTP_BASE}/${_repo}" -name "*.pkg.tar.?z" \
+				-printf "%f\n" | sed "s/^\(.\+\)-[^-]\+-[^-]\+-[^-]\+$/\1/"
 			))
 
 	# Compares them, whatever is on repos but not on abs should be removed
-	remove=($(comm -13 <(echo ${on_abs[@]} | tr ' ' "\n" | sort -u) \
-		<(echo ${on_repo[@]} | tr ' ' "\n" | sort -u)))
+	remove=($(comm -13 \
+	               <(printf '%s\n' "${on_abs[@]}"  | sort -u) \
+	               <(printf '%s\n' "${on_repo[@]}" | sort -u) ))
 
 	# Remove them from databases, ftpdir-cleanup will take care of the rest
-	find ${FTP_BASE}/${_repo} -name "*.db.tar.?z" -exec \
-		repo-remove {} ${remove[@]} >/dev/null 2>&1 \;
+	find "${FTP_BASE}/${_repo}" -name "*.db.tar.?z" -exec \
+		repo-remove {} "${remove[@]}" >/dev/null 2>&1 \;
 
 	msg2 "Removed the following packages:"
-	plain "$(echo ${remove[@]} | tr ' ' "\n")"
+	plain '%s' "${remove[@]}"
 
 done
 
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 8171980..9c07c22 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -9,7 +9,7 @@ script_lock
 
 for repo in "${PKGREPOS[@]}"; do
 	for arch in "${ARCHES[@]}"; do
-		repo_lock ${repo} ${arch} || exit 1
+		repo_lock "${repo}" "${arch}" || exit 1
 	done
 done
 
@@ -41,7 +41,7 @@ done
 
 for repo in "${PKGREPOS[@]}"; do
 	for arch in "${ARCHES[@]}"; do
-		repo_unlock ${repo} ${arch}
+		repo_unlock "${repo}" "${arch}"
 	done
 done
 
@@ -74,7 +74,7 @@ for repo in "${PKGREPOS[@]}"; do
 		# Build the source package if its not already there
 		if ! grep -Fqx "${pkgbase}-${pkgver}${SRCEXT}" "${WORKDIR}/available-src-pkgs"; then
 			# Check if we had failed before
-			if in_array "${pkgbase}-${pkgver}${SRCEXT}" ${failedpkgs[@]}; then
+			if in_array "${pkgbase}-${pkgver}${SRCEXT}" "${failedpkgs[@]}"; then
 				continue
 			fi
 
@@ -99,9 +99,9 @@ for repo in "${PKGREPOS[@]}"; do
 				mv "${pkgbase}-${pkgver}${SRCEXT}" "${FTP_BASE}/${SRCPOOL}"
 				# Avoid creating the same source package for every arch
 				echo "${pkgbase}-${pkgver}${SRCEXT}" >> "${WORKDIR}/available-src-pkgs"
-				newpkgs[${#newpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
+				newpkgs+=("${pkgbase}-${pkgver}${SRCEXT}")
 			else
-				failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
+				failedpkgs+=("${pkgbase}-${pkgver}${SRCEXT}")
 			fi
 			popd >/dev/null
 		fi
@@ -128,22 +128,22 @@ 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'
+	"${SOURCE_CLEANUP_DRYRUN}" && warning 'dry run mode is active'
 	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 "${old_pkg}"
-		if ! ${SOURCE_CLEANUP_DRYRUN}; then
+		if ! "${SOURCE_CLEANUP_DRYRUN}"; then
 			mv "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
 			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 		fi
 	done
 fi
 
-old_pkgs=($(find ${SOURCE_CLEANUP_DESTDIR} -type f -name "*${SRCEXT}" -mtime +${SOURCE_CLEANUP_KEEP} -printf '%f\n'))
+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
 		msg2 "${old_pkg}"
-		${SOURCE_CLEANUP_DRYRUN} || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
+		"${SOURCE_CLEANUP_DRYRUN}" || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 	done
 fi
 
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index 49a2dac..f7b3779 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -24,11 +24,11 @@ pushd "${SVNREPO}" >/dev/null
 for repo in "${PKGREPOS[@]}"; do
 	msg "Sourceballing [${repo}]"
 
-	pushd $repo >/dev/null
+	pushd "$repo" >/dev/null
 	find -maxdepth 1 -type d | while read pkg; do
 		pushd "${SVNREPO}/$repo/$pkg" >/dev/null
 
-		[[ ! -e PKGBUILD ]] && {
+		[[ ! -e ./PKGBUILD ]] && {
 			warning "$repo/$pkg is not a package"
 			continue
 		}
@@ -41,7 +41,7 @@ for repo in "${PKGREPOS[@]}"; do
 			optdepends license arch options check mksource
 
 		for _pkg in "${pkgname[@]}"; do
-			unset package_${_pkg} >/dev/null 2>&1
+			unset "package_${_pkg}" >/dev/null 2>&1
 		done
 
 		pkgbase=${pkgbase:-$pkgname}
@@ -54,7 +54,7 @@ for repo in "${PKGREPOS[@]}"; do
 
 		makepkg --allsource --ignorearch -c >/dev/null 2>&1
 
-		[ $? -ne 0 ] && plain ${srcfile}
+		[ $? -ne 0 ] && plain '%s' "${srcfile}"
 
 	done # end find pkgs
 	popd >/dev/null
diff --git a/cron-jobs/update-abs-tarballs b/cron-jobs/update-abs-tarballs
index 901cc4b..e710f7c 100755
--- a/cron-jobs/update-abs-tarballs
+++ b/cron-jobs/update-abs-tarballs
@@ -2,6 +2,4 @@
 
 . "$(dirname "$(readlink -e "$0")")/../config"
 
-rsync -av --exclude=staging/ parabolagnulinux.org::abstar/ ${FTP_BASE}/
-
-exit $?
+rsync -av --exclude=staging/ parabolagnulinux.org::abstar/ "${FTP_BASE}/"