From 9037a0261324d298d98879b6c9674ed91aa537e9 Mon Sep 17 00:00:00 2001
From: Nick Sellen <git@nicksellen.co.uk>
Date: Wed, 29 Nov 2017 17:54:16 +0000
Subject: [PATCH] Minor tweaks to ensure clean git status
---
roles/live2dev/templates/cron.j2 | 3 +++
roles/live2dev/templates/update.j2 | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/roles/live2dev/templates/cron.j2 b/roles/live2dev/templates/cron.j2
index 07cbb55..b1e770b 100644
--- a/roles/live2dev/templates/cron.j2
+++ b/roles/live2dev/templates/cron.j2
@@ -13,6 +13,9 @@ fi
cd ~/sites
+# Remove any untracked files/directories
+git clean -fd
+
GIT_PULL=$(git pull | grep -v "up-to-date")
if [[ ${GIT_PULL} != "" ]]; then
diff --git a/roles/live2dev/templates/update.j2 b/roles/live2dev/templates/update.j2
index 5bee84e..a77ff29 100644
--- a/roles/live2dev/templates/update.j2
+++ b/roles/live2dev/templates/update.j2
@@ -15,7 +15,7 @@ cd /home/{{ item }}/sites
git stash save "Local changes stashed"
git pull
rm -rf web/wp
-composer update
+composer install
cd web/app/themes/coop-tech-oowp-theme
composer update
npm install
--
GitLab