diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-07-30 13:05:54 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-07-30 13:05:54 +0200 |
| commit | fc2931f3ba5010d195a138fde5df5fac42145da1 (patch) | |
| tree | 0553a7ef52095e5c766352ef6d5387f57e1a4832 /crowdin | |
| parent | 6d2bb9f7262eb144104908fc24085e72e8c42aff (diff) | |
| download | cgeo-fc2931f3ba5010d195a138fde5df5fac42145da1.zip cgeo-fc2931f3ba5010d195a138fde5df5fac42145da1.tar.gz cgeo-fc2931f3ba5010d195a138fde5df5fac42145da1.tar.bz2 | |
Do not switch branch automatically
Not everyone uses the "master" name for the branch or the "upstream"
name for the github remote. Since this script will be run manually when
new strings are added, it should not mess with the git content
automatically.
Diffstat (limited to 'crowdin')
| -rwxr-xr-x | crowdin/update | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crowdin/update b/crowdin/update index 560ca8a..0546f97 100755 --- a/crowdin/update +++ b/crowdin/update @@ -20,8 +20,9 @@ update_file() { . "`dirname $0`/globals" -_do git checkout master || die "git checkout master failed." -_do git pull upstream master || die "git pull upstream master failed." +echo You must be on an up-to-date master branch to execute this script. +echo You have 5 seconds to abort with ctrl-c if this is not the case. +sleep 5 update_file main/res/values/strings.xml /cgeo/strings.xml update_file cgeo-calendar/res/values/strings.xml /cgeo-calendar/strings.xml |