--- builds_bin/genpatches	2008/07/08 13:58:19	1.1
+++ builds_bin/genpatches	2009/03/05 21:41:33	1.7
@@ -3,6 +3,10 @@
 # Functions
 . /etc/pootle/bin/functions
 
+# Clean up tmp dir
+rm -rf /etc/pootle/tmp
+mkdir -p /etc/pootle/tmp /var/www/html/{patches,errors,anaconda}
+
 #==========================================================
 
 cd /etc/pootle/tmp
@@ -22,17 +26,25 @@ do
     # Build console files
     pkgname=$(ls -d /etc/pootle/cvs/smeserver/smeserver-locale/*7/*/root | cut -d/ -f8)
     mkdir -p ${pkgname}.update/po/$lang
-    for pkg in $(ls /etc/pootle/po/sme7bc/templates/ -I anaconda.pot | sed 's@\.pot@\.po@')
+    for pkg in $(ls /etc/pootle/po/sme7bc/templates/ -I anaconda.pot | sed -n 's@\.pot@\.po@p')
     do
 	msgcat -F --no-wrap /etc/pootle/po/sme7bc/$lang/$pkg \
 	| grep -v 'Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|X-Generator' \
 	| sed '0,/msgid ""/{/^#/d};/^#,/d' \
 	> ${pkgname}.update/po/$lang/$pkg
     done 
+
+    # Build sme7admin file
+    pkgname=$(ls -d /etc/pootle/cvs/smecontribs/smeserver-sme7admin/*7/*/root | cut -d/ -f8)
+    mkdir -p ${pkgname}.update/po/$lang
+    msgcat -F --no-wrap /etc/pootle/po/sme7cp/$lang/sme7admin.po \
+    | grep -v 'Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|X-Generator' \
+    | sed '0,/msgid ""/{/^#/d};/^#,/d' \
+    > ${pkgname}.update/po/$lang/sme7admin.po
 done
 
 # Build translated xml files
-for pkg in $(ls /etc/pootle/po/sme7*p/templates/ | sed -n 's@\.pot@@p')
+for pkg in $(ls /etc/pootle/po/sme7*p/templates/ -I sme7admin.pot | sed -n 's@\.pot@@p')
 do
     pkgname=$(find /etc/pootle/cvs/smecontribs/*/*7/*/root/etc/e-smith/locale/en-us -name $pkg | cut -d/ -f8)
     if [ -z "$pkgname" ]
@@ -60,8 +72,9 @@ done
 # Build xml diffs
 for pkg in $(ls -d *.update | sed 's@.update$@@')
 do
+    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
-    rm /var/www/html/patches/$(echo $pkg | sed 's/-[^-]\+$//')-*-locale-*.patch
     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
@@ -70,7 +83,13 @@ done
 # Build console diffs
 pkg=$(ls -d smeserver-locale-* | sed 's@.update$@@')
 orig=/etc/pootle/cvs/smeserver/smeserver-locale/*7/$pkg/po
-rm /var/www/html/patches/$(echo $pkg | sed 's/-[^-]\+$//')-*-locale-*.patch
+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