From 902f32786930a6cb64974964e8153360276b23eb Mon Sep 17 00:00:00 2001
From: Jerry Jacobs <jerry.jacobs@xor-gate.org>
Date: Wed, 15 Jan 2025 19:42:51 +0100
Subject: [PATCH] - Bump bundled Syncthing to v1.29.2 - (chore) Improve
 Syncthing bundle scripts

---
 Makefile                                | 2 +-
 cmd/update-release.py                   | 4 ++++
 syncthing/Info.plist                    | 4 ++--
 syncthing/Scripts/syncthing-resource.sh | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index b020d16..fa91329 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,6 @@ release-dmg:
 	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme Pods-syncthing
 	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme syncthing-dmg
 release-update:
-	./cmd/update-release.py
+	source ./venv/bin/activate && ./cmd/update-release.py
 clean:
 	rm -Rf Build Index Logs ModuleCache.noindex info.plist
diff --git a/cmd/update-release.py b/cmd/update-release.py
index 5403aa3..e2aa828 100755
--- a/cmd/update-release.py
+++ b/cmd/update-release.py
@@ -72,3 +72,7 @@
 	if line.startswith(linePrefix):
 		line = '{}"{}"\n'.format(linePrefix, str(version))
 	sys.stdout.write(line)
+
+print(f"Found latest tag from github: {tag_name}")
+print(f"CFBundleShortVersionString={CFBundleShortVersionString}")
+print(f"CFBundleVersion={CFBundleVersion}")
diff --git a/syncthing/Info.plist b/syncthing/Info.plist
index 361d480..13fc9d4 100644
--- a/syncthing/Info.plist
+++ b/syncthing/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.28.1-1</string>
+	<string>1.29.2-1</string>
 	<key>CFBundleVersion</key>
-	<string>102800101</string>
+	<string>102900201</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/syncthing/Scripts/syncthing-resource.sh b/syncthing/Scripts/syncthing-resource.sh
index 1e07627..8ddbeeb 100755
--- a/syncthing/Scripts/syncthing-resource.sh
+++ b/syncthing/Scripts/syncthing-resource.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # Download and unpack syncthing into ${PRODUCT_NAME}.app/Contents/Resources
-SYNCTHING_VERSION="1.28.1"
+SYNCTHING_VERSION="1.29.2"
 SYNCTHING_DIST_URL="https://github.com/syncthing/syncthing/releases/download"
 SYNCTHING_TARBALL_URL="${SYNCTHING_DIST_URL}/v${SYNCTHING_VERSION}/syncthing-macos-universal-v${SYNCTHING_VERSION}.zip"