diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-11-24 21:44:48 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-11-24 21:47:40 +0100 |
| commit | 75ca70852b9820a545da9594e76865e2db2950c5 (patch) | |
| tree | 1de52012e48a28e96963a63f25eda10279a98608 /crowdin/download | |
| parent | cbe5cf089d71e5742cc40637c380cde3e04e5505 (diff) | |
| download | cgeo-75ca70852b9820a545da9594e76865e2db2950c5.zip cgeo-75ca70852b9820a545da9594e76865e2db2950c5.tar.gz cgeo-75ca70852b9820a545da9594e76865e2db2950c5.tar.bz2 | |
Fix crowdin local patches application
Also use stackable bash subshells instead of backquotes.
Diffstat (limited to 'crowdin/download')
| -rwxr-xr-x | crowdin/download | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crowdin/download b/crowdin/download index 7465ad3..b6bbe40 100755 --- a/crowdin/download +++ b/crowdin/download @@ -10,12 +10,12 @@ # see: http://crowdin.net/page/api/export # see: http://crowdin.net/page/api/download -. "`dirname $0`/globals" +. "$(dirname $0)/globals" BRANCH=crowdin_translations GITHUB_PR_TITLE="crowdin: New translations" PR_EXISTS=0 -DDATE=`date +"%Y-%m-%d %H:%M:%S"` +DDATE=$(date +"%Y-%m-%d %H:%M:%S") ZIPFILE=all.zip # default base branch BASE_BRANCH=master @@ -76,10 +76,10 @@ for f in */*/*values-*/strings.xml; do done # apply local patches to particular strings -. "`dirname $0`/local-patches" +. "$progdir/local-patches" # check for changes -if [ -z "`git diff`" ]; then +if [ -z "$(git diff)" ]; then debug "no changes, finishing." finish exit @@ -87,7 +87,7 @@ fi # upload changes to github AMEND="" -[[ ! -z "`git log ${BASE_BRANCH}..${BRANCH}`" ]] && AMEND="--amend" +[[ ! -z "$(git log ${BASE_BRANCH}..${BRANCH})" ]] && AMEND="--amend" _do git commit -a "${AMEND}" -m \"${GITHUB_PR_TITLE}\" || die "commit failed." _do git push -f origin "${BRANCH}" || die "git push failed." |