From fc2931f3ba5010d195a138fde5df5fac42145da1 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Tue, 30 Jul 2013 13:05:54 +0200 Subject: 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. --- crowdin/update | 5 +++-- 1 file 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 -- cgit v1.1