From b04c8cc063085e90e250ecbf5c4cc26a47622a8e Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 7 Aug 2024 08:06:21 +0200
Subject: [PATCH] Move apply_patches to its own script

---
 apply_patches.sh  | 26 ++++++++++++++++++++++++++
 merge_upstream.sh | 15 +--------------
 2 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100755 apply_patches.sh

diff --git a/apply_patches.sh b/apply_patches.sh
new file mode 100755
index 0000000..7b14e85
--- /dev/null
+++ b/apply_patches.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+mydir="$(dirname "$(realpath "$0")")"
+
+pushd "$mydir" > /dev/null
+
+source ./merge_helpers.sh
+
+# Apply our patches
+apply_patches matrix-js-sdk
+apply_patches matrix-react-sdk
+#apply_patches element-web
+apply_patches element-desktop
+
+# Automatic adjustments
+#automatic_i18n_adjustment
+automatic_packagejson_adjustment
+
+# Automatic theme update
+#pushd "matrix-react-sdk" > /dev/null
+#./theme.sh y
+#popd > /dev/null
+
+popd > /dev/null
diff --git a/merge_upstream.sh b/merge_upstream.sh
index 805fe8c..e1fd1f2 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -50,19 +50,6 @@ popd > /dev/null
 make clean
 make setup
 
-# Apply our patches
-apply_patches matrix-js-sdk
-apply_patches matrix-react-sdk
-#apply_patches element-web
-apply_patches element-desktop
-
-# Automatic adjustments
-#automatic_i18n_adjustment
-automatic_packagejson_adjustment
-
-# Automatic theme update
-#pushd "matrix-react-sdk" > /dev/null
-#./theme.sh y
-#popd > /dev/null
+./apply_patches.sh
 
 popd > /dev/null