From fc367e8e93f030823f4ba89293223791e9d12d15 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 24 Jul 2017 20:39:28 -0400 Subject: [PATCH] Avoid issues with local untracked locale files in deploy.sh --- scripts/deploy.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index c97e02c38..13b04a419 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -17,6 +17,8 @@ orig=`git rev-parse --short origin/master` # pull latest code if [[ "${rev}" != "${orig}" ]] ; then + # avoid issues with local untracked locale files + rm -f dist/locales/*.json git reset --hard HEAD git pull origin master @@ -24,7 +26,7 @@ if [[ "${rev}" != "${orig}" ]] ; then sed -i "s/context.version = .*;/context.version = '${rev}';/" modules/core/context.js npm prune - npm install + npm install > /dev/null 2>&1 fi # pull latest imagery