From b54508bb282040963bfd50a4703a619c6d8191f0 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 17 Apr 2017 10:40:15 -0400 Subject: [PATCH] when generating strings verify that SSK is on master Otherwise it's really easy to generate strings from the wrong branch // FREEBIE --- Signal/translations/bin/auto-genstrings | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Signal/translations/bin/auto-genstrings b/Signal/translations/bin/auto-genstrings index 06517a215..83241223e 100755 --- a/Signal/translations/bin/auto-genstrings +++ b/Signal/translations/bin/auto-genstrings @@ -1,9 +1,19 @@ #!/usr/bin/env bash set -e -set -x -TARGETS="Signal/src ../SignalServiceKit/src" +SSK_DIR="../SignalServiceKit/src" + +pushd $SSK_DIR +CURRENT_SSK_BRANCH=$(git status|awk 'NR==1{print $3}') +if [ $CURRENT_SSK_BRANCH != "master" ] +then + echo "[!] Error - SSK must be on master to be sure we're generating up-to-date strings" + exit 1 +fi +popd + +TARGETS="Signal/src ${SSK_DIR}" TMP="$(mktemp -d)" STRINGFILE="Signal/translations/en.lproj/Localizable.strings"