From: yomguy Date: Tue, 7 Feb 2012 00:43:10 +0000 (+0100) Subject: add dev tools X-Git-Tag: 1.3.10~21 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c048ec766d2fd51ae9747b8a10f726dec1389929;p=telemeta.git add dev tools --- diff --git a/tools/dev/merge_master_all.sh b/tools/dev/merge_master_all.sh new file mode 100755 index 00000000..b1d52164 --- /dev/null +++ b/tools/dev/merge_master_all.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +git branch | tr -d \* | while read line +do + branch=${line/#\ } + + if [[ ! $branch == *master* ]]; then + echo "Merge master to $branch:" + git checkout $branch + git merge master + git checkout master + fi +done + +echo "Done !" diff --git a/tools/dev/merge_master_to.sh b/tools/dev/merge_master_to.sh new file mode 100755 index 00000000..e6e1cf71 --- /dev/null +++ b/tools/dev/merge_master_to.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +git checkout $1 +git merge master +git checkout master + diff --git a/tools/dev/push.sh b/tools/dev/push.sh new file mode 100755 index 00000000..f1bf826e --- /dev/null +++ b/tools/dev/push.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +git branch | tr -d \* | while read line +do + branch=${line/#\ } + + echo "Push $branch to origin:" + git push origin $branch + + echo "Push $branch to web:" + git push web $branch + + if [[ $branch == *master* ]]; then + echo "Push $branch to github:" + git push github $branch + fi + +done + +git push --tags +git push --tags web +git push --tags github + +ssh vcs.parisson.com "cd /var/git/telemeta.git; git update-server-info" +ssh vcs.parisson.org "cd /var/git/telemeta.git; git update-server-info" + +echo "Update jimi.parisson.com:" +ssh jimi.parisson.com "cd /home/telemeta/telemeta; git pull origin production" +echo "Update angus.parisson.com:" +ssh angus.parisson.com "cd /home/telemeta/telemeta; git pull origin production" + + +echo "Done !" diff --git a/tools/dev/translate.sh b/tools/dev/translate.sh new file mode 100755 index 00000000..ce8741f4 --- /dev/null +++ b/tools/dev/translate.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +cd telemeta +django-admin makemessages -a +django-admin makemessages -d djangojs -a +django-admin compilemessages +cd ..