Commands only needed prior to release

This commit is contained in:
Bob Mottram 2016-11-05 17:09:09 +00:00
parent ef288e01d6
commit 8bf7683861
1 changed files with 2 additions and 0 deletions

View File

@ -65,6 +65,8 @@ if [ -d $PROJECT_DIR ]; then
rm -rf $PROJECT_DIR/locale/* rm -rf $PROJECT_DIR/locale/*
git checkout stockholm git checkout stockholm
# TODO after stockholm merge change this to git_pull # TODO after stockholm merge change this to git_pull
git merge --abort
git stash
git pull $PROJECT_REPO git pull $PROJECT_REPO
make install make install
${PROJECT_NAME} -c $CONFIGURATION_FILE ${PROJECT_NAME} -c $CONFIGURATION_FILE