[SVN] r793 - /trunk/cyrus-imapd-2.2.13/debian/cyrus-makedirs

[debian at incase.de]

Author: sven
Date: Thu Sep  3 11:35:11 2009
New Revision: 793

URL: https://mail.incase.de/viewcvs?rev=793&root=cyrus22&view=rev
Log:
Update cyrus-makedirs to be more performant (using xargs to call chmod et al. instead of using find -exec)

Modified:
    trunk/cyrus-imapd-2.2.13/debian/cyrus-makedirs

Modified: trunk/cyrus-imapd-2.2.13/debian/cyrus-makedirs
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/cyrus-makedirs?rev=793&root=cyrus22&r1=792&r2=793&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/cyrus-makedirs (original)
+++ trunk/cyrus-imapd-2.2.13/debian/cyrus-makedirs Thu Sep  3 11:35:11 2009
@@ -89,7 +89,7 @@
     	[ -d "$confdir/$i/$j" ] || mkdir "$confdir/$i/$j"
     done
 done
-find "$confdir" -print0 \( -not -user cyrus -or  -not -group mail \) | xargs -r -0 chown cyrus:mail
+find "$confdir" \( -not -user cyrus -or  -not -group mail \) -print0 | xargs -r -0 chown cyrus:mail
 
 # Now, create the spool partitions
 for i in $partitions ; do
@@ -102,9 +102,9 @@
 	   done
 	}
 	[ -d "$i/stage." ] || mkdir "$i/stage."
-	find "$i" -print0 \( -not -user cyrus -or  -not -group mail \) | xargs -r -0 chown cyrus:mail
+	find "$i" \( -not -user cyrus -or  -not -group mail \) -print0 | xargs -r -0 chown cyrus:mail
 	# and kill any squatter indexes
-	[ $killsquat -ne 0 ] && find "$i" -name 'cyrus.squat' -type f -exec rm -f "{}" \;
+	[ $killsquat -ne 0 ] && find "$i" -name 'cyrus.squat' -type f -print0 | xargs -r -0 rm -f
 done
 
 # And the sieve directory structure
@@ -115,7 +115,7 @@
 		[ -d "$sievedir/$j" ] || mkdir "$sievedir/$j"
 		chmod 755 "$sievedir/$j"
 	done
-	find "$sievedir" -print0 \( -not -user cyrus -or  -not -group mail \) | xargs -r -0 chown cyrus:mail
+	find "$sievedir" \( -not -user cyrus -or  -not -group mail \) -print0 | xargs -r -0 chown cyrus:mail
 }
 
 [ "x${CYRUSOPTFILESYS}" != "x1" ] && exit 0
@@ -133,11 +133,11 @@
 	case ${i} in
 	ext2)
   		echo "Setting attributes to +S for  ${partsys%% *}..."
-		find "${partsys%% *}" -type d -exec chattr +S "{}" \;
+		find "${partsys%% *}" -type d -print0 | xargs -r -0 chattr +S
 		;;
 	ext3)
   		echo "Setting attributes to -S -j for  ${partsys%% *}..."
-		find "${partsys%% *}" -type d -exec chattr -S -j "{}" \;
+		find "${partsys%% *}" -type d -print0 | xargs -r -0  chattr -S -j
 		;;
 	esac
 	partsys="${partsys#* }"