--- builds_bin/rsync_sme	2010/05/23 19:50:15	1.3
+++ builds_bin/rsync_sme	2010/11/21 22:10:39	1.7
@@ -1,38 +1,27 @@
 #!/bin/bash
 
-ver7=7.5
-ver8=8.0
-isos=true
+prefix=sme
+ver=$(basename $(readlink -f /stage/${1:-8}))
+isos=${2:-false}
 
-if [ ! -z "$ver7" ]
+mkdir -p  /releases/testing/$ver/{${prefix}os,iso}
+if $isos
 then
-    mkdir -p  /releases/testing/$ver7/{smeos,iso}
-    if $isos
-    then
-        rsync -avhHP --delete /stage/iso/7/ /releases/testing/$ver7/iso/
-    else
-        rsync -avhHP --exclude '*.iso*' --delete-excluded --delete /stage/iso/7/ /releases/testing/$ver7/iso/
-    fi
-    rsync -avhHP --exclude 'product/' --exclude 'updates/' --exclude 'pkgorder.*' --exclude 'build_*' --exclude '*.jigdo/' --delete-excluded --delete /stage/7/ /releases/testing/$ver7/smeos/
+    rsync -avhHP --delete /stage/iso/${ver:0:1}/ /releases/testing/$ver/iso/
+else
+    rsync -avhHP --exclude '*.iso*' --delete-excluded --delete /stage/iso/${ver:0:1}/ /releases/testing/$ver/iso/
 fi
-
-if [ ! -z "$ver8" ]
+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
-    mkdir -p  /releases/testing/$ver8/{smeos,iso}
-    if $isos
-    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/
-    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/
+    createrepo --update --database --groupfile repodata/comps.xml /releases/testing/$ver/${prefix}os/i386/
+    createrepo --update --database --groupfile repodata/comps.xml /releases/testing/$ver/${prefix}os/x86_64/
 fi
 
 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 -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 {} \+
+chgrp updates $(ls -d /releases{/,/testing}/[0-9]/${prefix}updates-testing/i386/RPMS 2> /dev/null)
+chgrp contribs $(ls -d /releases{/,/testing}/[0-9]/${prefix}contribs/i386/RPMS 2> /dev/null)