--- builds_bin/rsync_sme	2010/02/12 18:52:06	1.1
+++ builds_bin/rsync_sme	2012/05/25 23:59:46	1.8
@@ -1,31 +1,28 @@
 #!/bin/bash
 
-ver7=7.5beta1
-ver8=8.0beta5
-isos=false
+prefix=sme
+ver=$(basename $(readlink -f /stage/${1:-8}))
+isos=${2:-false}
 
-mkdir -p  /releases/testing/$ver8/{smeos,iso}
+mkdir -p  /releases/testing/$ver/{${prefix}os,iso}
 if $isos
 then
-    rsync -avhHP --delete /stage/iso/7/ /releases/testing/$ver7/iso/
+    rsync -avhHP --delete /stage/iso/${ver:0:1}/ /releases/testing/$ver/iso/
 else
-    rsync -avhHP --exclude '*.iso*' --delete-excluded --delete /stage/iso/7/ /releases/testing/$ver7/iso/
+    rsync -avhHP --exclude '*.iso*' --delete-excluded --delete /stage/iso/${ver:0:1}/ /releases/testing/$ver/iso/
 fi
-rsync -avhHP --exclude 'product/' --exclude 'updates/' --exclude 'pkgorder.*' --exclude 'build_*' --exclude '*.jigdo/' --delete-excluded --delete /stage/7/ /releases/testing/$ver7/smeos/
-
-if $isos
+rsync -avhHP --exclude 'product/' --exclude 'updates/' --exclude 'pkgorder.*' --exclude 'build_*' --exclude '*.jigdo/' --delete-excluded --delete /stage/${ver:0:1}/ /releases/testing/$ver/${prefix}os/
+if [ -f /releases/testing/$ver/${prefix}os/i386/repodata/comps.xml ]
 then
-    rsync -avhHP --delete /stage/iso/8/ /releases/testing/$ver8/iso/
-else
-    rsync -avhHP --exclude '*.iso*' --delete-excluded --delete /stage/iso/8/ /releases/testing/$ver8/iso/
+    createrepo --update --database --checksum sha --groupfile repodata/comps.xml /releases/testing/$ver/${prefix}os/i386/
+    createrepo --update --database --checksum sha --groupfile repodata/comps.xml /releases/testing/$ver/${prefix}os/x86_64/
 fi
-rsync -avhHP --exclude 'updates/' --exclude 'pkgorder.*' --exclude 'build_*' --exclude '*.jigdo/' --delete-excluded --delete /stage/8/ /releases/testing/$ver8/smeos/
-createrepo --update --database --groupfile repodata/comps.xml /releases/testing/$ver8/smeos/i386/
-createrepo --update --database --groupfile repodata/comps.xml /releases/testing/$ver8/smeos/x86_64/
 
 ls /builds /releases /stage > /dev/null
-find /builds/ /releases/ /stage/ -\( -not -user releases -o -not -group releases -\) -print0 | xargs -r0 chown releases:releases
-chgrp updates /releases/{7,testing/8}/smeupdates-testing/i386/RPMS
-chgrp contribs /releases/{7,testing/8}/smecontribs/i386/RPMS
-find /builds/ /releases/ /stage/ -type f -\( -not -perm -664 -o -perm -002 -\) -print0 | xargs -r0 chmod u+rw,g+rw,o+r,o-w
-find /builds/ /releases/ /stage/ -type d -\( -not -perm -2775 -o -perm -002 -\) -print0 | xargs -r0 chmod u+rwx,g+rwxs,o+rx,o-w
+find /builds/ /releases/ /stage/ -not -user releases -exec chown -h releases {} \+ \
+                               , -not -regex ".*/${prefix}\(contribs\|updates-testing\)/i386/RPMS" \
+                                 -not -group releases -exec chgrp -h releases {} \+ \
+                               , -type f -\( -not -perm -664 -o -perm -002 -\) -exec chmod u+rw,g+rw,o+r,o-w {} \+ \
+                               , -type d -\( -not -perm -2775 -o -perm -002 -\) -exec chmod u+rwx,g+rwxs,o+rx,o-w {} \+ \
+                               , -regex ".*/${prefix}updates-testing/i386/RPMS" -exec chgrp updates {} \+ \
+                               , -regex ".*/${prefix}contribs/i386/RPMS" -exec chgrp contribs {} \+