projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Send icon name instead of pixmap
[quassel.git]
/
scripts
/
tx-sync.sh
diff --git
a/scripts/tx-sync.sh
b/scripts/tx-sync.sh
index
47b931c
..
33289ab
100755
(executable)
--- a/
scripts/tx-sync.sh
+++ b/
scripts/tx-sync.sh
@@
-1,12
+1,19
@@
#!/usr/bin/env bash
#!/usr/bin/env bash
+set -u
quasselsrc=/usr/src/quassel
localpobranch=i18n-tx-sync
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 && (
pushd "$quasselsrc" && (
currb=$(git name-rev --name-only HEAD)
git checkout -q $localpobranch && (
- git pull -q
- 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
); git checkout -q "$currb"
); popd