From 412cbad76bd82e5db94148389582be9c7aca5073 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Mon, 21 Dec 2020 19:49:51 +0100
Subject: [PATCH] Automatic theme update and make clean on upstream merge

---
 merge_upstream.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/merge_upstream.sh b/merge_upstream.sh
index 2d21c08..7956fd3 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -15,6 +15,13 @@ forall_repos check_branch $branch
 forall_repos git fetch upstream
 forall_repos git merge upstream/master
 
-./setup.sh
+# Automatic theme update
+pushd "matrix-react-sdk" > /dev/null
+./theme.sh
+popd > /dev/null
+
+# Refresh environment
+make clean
+make setup
 
 popd > /dev/null