X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=scripts%2Ftx-sync.sh;h=33289ab782bdce2a85ab3b47aefc4f7a71230872;hp=c60d6af060fd425f22a4e15295b7ae5c6dbd39e1;hb=dd1d9d68c406b993230161208cbd17db55dc85a9;hpb=221b0a8e10afc3f2c9148caf3cb727760a205eb8

diff --git a/scripts/tx-sync.sh b/scripts/tx-sync.sh
index c60d6af0..33289ab7 100755
--- a/scripts/tx-sync.sh
+++ b/scripts/tx-sync.sh
@@ -1,11 +1,19 @@
 #!/usr/bin/env bash
+set -u
 quasselsrc=/usr/src/quassel
 localpobranch=i18n-tx-sync
+remote=origin
+branch=master
 
 pushd "$quasselsrc" && ( 
   currb=$(git name-rev --name-only HEAD)
   git checkout -q $localpobranch && (
-    EDITOR=/bin/true VISUAL=/usr/bin/editor "$quasselsrc"/po/pull-from-transifex.sh -f &&
-      git push -q
+    git pull -q --no-edit $remote $branch &&
+    pushd po/ &&
+    ./update-pot.sh &&
+    git commit -qm 'Update quassel.pot' ${quasselsrc}/po/quassel.pot
+    popd &&
+    "$quasselsrc"/po/pull-from-transifex.sh -f &&
+    git push -q
   ); git checkout -q "$currb"
 ); popd