From 4ba25dffefac4d392c95b85f3b118f97137d4e1c Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 23 Mar 2020 09:04:17 -0700 Subject: [PATCH] Update deploy.sh for new branch names --- scripts/deploy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index f95ae09e9..d4f68fe84 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -9,18 +9,18 @@ # To use this on your own site, you'll want to change the `cp` and `chgrp` # lines at the end to match your web server's documentroot folder and security group. -git checkout -q master +git checkout -q develop git remote update > /dev/null rev=`git rev-parse --short HEAD` -orig=`git rev-parse --short origin/master` +orig=`git rev-parse --short origin/develop` # 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 + git pull origin develop rev=`git rev-parse --short HEAD` sed -i "s/context.version = .*;/context.version = '${rev}';/" modules/core/context.js