[Debian-l10n-commits] compendia branch master updated. 7117057a3438f84ef4afb75a5d64607d7a20f4af

[Christian Perrier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "compendia".

The branch, master has been updated
       via  7117057a3438f84ef4afb75a5d64607d7a20f4af (commit)
      from  d2426f2c59fa042d77d89cd5c8add64cb7d6cb7f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------

http://anonscm.debian.org/gitweb/?p=debian-l10n/compendia.git;a=commitdiff;h=7117057a3438f84ef4afb75a5d64607d7a20f4af

commit 7117057a3438f84ef4afb75a5d64607d7a20f4af
Author: Christian PERRIER <bubulle at debian.org>
Date:   Sun Jul 15 16:11:10 2012 -0600

    Adapt to i18n.debian.org layout

-----------------------------------------------------------------------

Summary of changes:
 createcompendium |   20 ++++++++++----------
 gen_compendia    |    8 ++------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/createcompendium b/createcompendium
index 64febf3..73bf972 100755
--- a/createcompendium
+++ b/createcompendium
@@ -16,25 +16,25 @@ trap 'rm -rf "$POTMPDIR"' 0
 
 [ $# = 1 ] && MSGLANG=$1 || exit 1
 
-find "$SITEDIR" -name "*_${MSGLANG}.po.gz" -exec cp {} "$POTMPDIR" \;
+find "$MATERIALDIR/po/unstable" -name "*_${MSGLANG}.po.gz" -exec cp {} "$POTMPDIR" \;
 gunzip "$POTMPDIR"/*
-RESULTS="$RESULTS/$MSGLANG"
-mkdir -p "$RESULTS"
+OUTDIR="$OUTDIR/$MSGLANG"
+mkdir -p "$OUTDIR"
 
-exec &>"$RESULTS/$STAMP.log"
+exec &>"$OUTDIR/$STAMP.log"
 # for some odd reason convert_or_remove needs to be an external file
 # maybe because find doesn't have it defined in its environment
 find "$POTMPDIR" -name *.po -exec ./convert_or_remove {} \;
-msgcat -o "$RESULTS/compendium-$MSGLANG-stamp$STAMP.po" $POTMPDIR/*.po || {
-	echo "EEE: failed to generate $RESULTS/compendium-$MSGLANG-stamp$STAMP.po"
+msgcat -o "$OUTDIR/compendium-$MSGLANG-stamp$STAMP.po" $POTMPDIR/*.po || {
+	echo "EEE: failed to generate $OUTDIR/compendium-$MSGLANG-stamp$STAMP.po"
 	exit 1
 }
 
 
-echo "III: generated $RESULTS/compendium-$MSGLANG-stamp$STAMP.po"
+echo "III: generated $OUTDIR/compendium-$MSGLANG-stamp$STAMP.po"
 
 # In order to be useful, the latest compendium needs to be used by users
-ln -sf "$RESULTS/compendium-$MSGLANG-stamp$STAMP.po" "$RESULTS/compendium-$MSGLANG-LATEST.po"
+ln -sf "$OUTDIR/compendium-$MSGLANG-stamp$STAMP.po" "$OUTDIR/compendium-$MSGLANG-LATEST.po"
 # Remove old compendia and log files if we were successful
-find "$RESULTS" -name "2*.log" -a -mtime "+1" -delete
-find "$RESULTS" -name "compendium-*.po" -a -mtime "+1" -delete
+find "$OUTDIR" -name "2*.log" -a -mtime "+1" -delete
+find "$OUTDIR" -name "compendium-*.po" -a -mtime "+1" -delete
diff --git a/gen_compendia b/gen_compendia
index 7453ec0..b5bda96 100755
--- a/gen_compendia
+++ b/gen_compendia
@@ -1,14 +1,10 @@
 #!/bin/bash
 set -e
 
-export GENCOMPENDIUMPATH="/srv/dl10n-stuff/svn/dl10n/compendia"
-
-cd "$GENCOMPENDIUMPATH"
-
-. "$GENCOMPENDIUMPATH"/l10n.conf
+cd "$OUTDIR"
 
 for LL in $COMPENDIUM_LANGS ; do
-	"$GENCOMPENDIUMPATH"/createcompendium $LL || {
+	$(dirname $(readlink -f $0))/createcompendium $LL || {
 		# This should not happen
 		echo "createcompendium failed for language $LL"
 	}
-----------------------------------------------------------------------


hooks/post-receive
-- 
compendia