[arch-projects] [dbscripts][PATCH] ftpdir-cleanup: fix ACL issues on nymeria

[Florian Pritz]

Signed-off-by: Florian Pritz <bluewind at xinu.at>
---

This is slightly different than the patch I applied on nymeria.
I've switched from using basename to bash, but it should work just fine
and so far the old version works on nymeria.

 cron-jobs/ftpdir-cleanup | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 15eb46c..e1294bd 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -3,6 +3,15 @@
 . "$(dirname $0)/../config"
 . "$(dirname $0)/../db-functions"
 
+# just like mv -f, but we touch the file and then copy the content so
+# default ACLs in the target dir will be applied
+mv_acl() {
+	rm -f "$2"
+	touch "$2"
+	cat "$1" >"$2" || return 1
+	rm -f "$1"
+}
+
 clean_pkg() {
 	local pkg
 	local target
@@ -12,9 +21,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
-- 
1.8.0.3