From b2abcf95b33fc3c24855da83bc71112098e849b4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 14:19:49 -0400
Subject: use mv_acl

---
 cron-jobs/ftpdir-cleanup | 4 ++--
 cron-jobs/sourceballs    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 04ca6c9..4a2b418 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -12,9 +12,9 @@ clean_pkg() {
 			if [ -h "$pkg" ]; then
 				rm -f "$pkg" "$pkg.sig"
 			else
-				mv -f "$pkg" "$CLEANUP_DESTDIR"
+				mv_acl "$pkg" "$CLEANUP_DESTDIR/${pkg##*/}"
 				if [ -e "$pkg.sig" ]; then
-					mv -f "$pkg.sig" "$CLEANUP_DESTDIR"
+					mv_acl "$pkg.sig" "$CLEANUP_DESTDIR/${pkg##*/}.sig"
 				fi
 				touch "${CLEANUP_DESTDIR}/${pkg##*/}"
 			fi
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 5ce7cfd..b172685 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -96,7 +96,7 @@ for repo in "${PKGREPOS[@]}"; do
 			pushd "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null
 			makepkg --nocolor --allsource --ignorearch # >/dev/null 2>&1
 			if [ $? -eq 0 ] && [ -f "${pkgbase}-${pkgver}${SRCEXT}" ]; then
-				mv "${pkgbase}-${pkgver}${SRCEXT}" "${FTP_BASE}/${SRCPOOL}"
+				mv_acl "${pkgbase}-${pkgver}${SRCEXT}" "${FTP_BASE}/${SRCPOOL}/${pkgbase}-${pkgver}${SRCEXT}"
 				# Avoid creating the same source package for every arch
 				echo "${pkgbase}-${pkgver}${SRCEXT}" >> "${WORKDIR}/available-src-pkgs"
 				newpkgs+=("${pkgbase}-${pkgver}${SRCEXT}")
@@ -132,7 +132,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 '%s' "${old_pkg}"
 		if ! "${SOURCE_CLEANUP_DRYRUN}"; then
-			mv "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
+			mv_acl "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 		fi
 	done
-- 
cgit v1.2.3-2-g168b