--- builds_bin/update_templates 2009/03/05 19:32:51 1.5 +++ builds_bin/update_templates 2009/06/07 17:11:51 1.8 @@ -13,12 +13,12 @@ export CVS_RSH=ssh # Update/expand smeserver cvs cd /etc/pootle/cvs/smeserver -for pkg in */sme7 anaconda/sme8 +for pkg in */sme7 anaconda/sme8 booty/sme8 do make -C $pkg clean &> /dev/null done cvs update -dPA > /dev/null -for pkg in */sme7 anaconda/sme8 +for pkg in */sme7 anaconda/sme8 booty/sme8 do make -C $pkg prep &> /dev/null done @@ -67,7 +67,7 @@ do diffcp /etc/pootle/templates/$(basename $pkg).pot /etc/pootle/po/sme7bp/templates/$(basename $pkg).pot done -# Update sme7admin templates +# Update sme7admin template potempl /etc/pootle/cvs/smecontribs/smeserver-sme7admin/*/*/root/{etc/e-smith/web/functions/sme7admin,usr/bin/sme7admind} > sme7admin.pot diffmv sme7admin.pot /etc/pootle/po/sme7cp/templates/sme7admin.pot @@ -191,8 +191,9 @@ done # Build xml diffs for pkg in $(ls -d *.update | sed 's@.update$@@') do - orig=/etc/pootle/cvs/sme*/*/*7/$pkg/root/etc/e-smith/locale rm -f /var/www/html/patches/$(echo $pkg | sed 's/-[^-]\+$//')-*-locale-*.patch + [ -d $pkg.update/root/etc/e-smith/locale ] || continue + orig=/etc/pootle/cvs/sme*/*/*7/$pkg/root/etc/e-smith/locale diff -ruN $orig $pkg.update/root/etc/e-smith/locale \ | sed 's@^\(---\|+++\) [^ ]\+/\([^/]\+/root/.*\)@\1 \2@;/^diff -ruN/d' \ > /var/www/html/patches/$pkg-locale-$(date +%F).patch @@ -204,4 +205,11 @@ orig=/etc/pootle/cvs/smeserver/smeserver diff -ruN $orig $pkg.update/po \ | sed 's@^\(---\|+++\) [^ ]\+/\([^/]\+/po/.*\)@\1 \2@;/^diff -ruN/d' \ >> /var/www/html/patches/$pkg-locale-$(date +%F).patch + +# Build sme7admin diff +pkg=$(ls -d smeserver-sme7admin-* | sed 's@.update$@@') +orig=/etc/pootle/cvs/smecontribs/smeserver-sme7admin/*7/$pkg/po +diff -ruN $orig $pkg.update/po \ +| sed 's@^\(---\|+++\) [^ ]\+/\([^/]\+/po/.*\)@\1 \2@;/^diff -ruN/d' \ +>> /var/www/html/patches/$pkg-locale-$(date +%F).patch