From 674bbf96677552d7da7b2fefd326dd299e473329 Mon Sep 17 00:00:00 2001
From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
Date: Wed, 20 Dec 2023 11:08:57 -0800
Subject: [PATCH] Chore: Website: Use only one commit per website update
 (#9558)

---
 packages/tools/release-website.sh | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/packages/tools/release-website.sh b/packages/tools/release-website.sh
index 44a15acc0..80565969d 100755
--- a/packages/tools/release-website.sh
+++ b/packages/tools/release-website.sh
@@ -72,13 +72,6 @@ CROWDIN_PERSONAL_TOKEN="$CROWDIN_PERSONAL_TOKEN" yarn crowdinDownload
 yarn buildWebsite
 
 cd "$JOPLIN_WEBSITE_ROOT_DIR"
-git add -A
-git commit -m "Updated website
-
-Auto-updated using $SCRIPT_NAME" || true
-
-git pull --rebase
-git push
 
 # Copy and update the plugin website.
 # 
@@ -95,16 +88,17 @@ if [ -f "$BUILT_PLUGIN_WEBSITE_FILE" ]; then
 	cd plugins
 
 	tar -xzvf "$BUILT_PLUGIN_WEBSITE_FILE"
-	cd "$JOPLIN_WEBSITE_ROOT_DIR"
-
-	git add -A
-	git commit -m "Updated plugin discovery website
-
-Auto-updated using $SCRIPT_NAME" || true
-
-	git pull --rebase
-	git push
 else
 	echo "Not updating plugin website -- release ($BUILT_PLUGIN_WEBSITE_FILE) not present"
 	exit 1
 fi
+
+
+cd "$JOPLIN_WEBSITE_ROOT_DIR"
+git add -A
+git commit -m "Updated website
+
+Auto-updated using $SCRIPT_NAME" || true
+
+git pull --rebase
+git push