Do not lock default setting value of syncthing daemon executable path in bundle (#242)

Do not lock executable path at the application bundle location. Fixes #228

Author: calmh

.github/workflows/build-syncthing-macos.yml

@@ -17,21 +17,29 @@ jobs:
   build-debug:
     name: Build debug
     if: github.event_name == 'push' && github.ref != 'refs/heads/release' # Debug not necessary on release branch (develop is intermediate branch)
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Build debug target
-        run: |
-          make debug
+        run: make debug
+
+      - name: Prepare debug build for artifact
+        run: make debug-dist 
+
+      - name: Archive artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: syncthing-macos-debug
+          path: Build/Products/Debug/dist
 
   build-release:
     name: Build release
     if: github.event_name == 'push' && github.ref == 'refs/heads/release'
     environment: signing
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
         with:

Makefile

@@ -2,6 +2,9 @@ all: debug
 debug:
 	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Debug -scheme Pods-syncthing
 	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Debug -scheme syncthing
+debug-dist:
+	mkdir -p Build/Products/Debug/dist
+	cp -r Build/Products/Debug/Syncthing.app Build/Products/Debug/dist
 debug-dmg:
 	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Debug -scheme Pods-syncthing
 	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Debug -scheme syncthing-dmg

cmd/update-release.py

@@ -14,7 +14,7 @@
 from urllib.request import urlopen
 from string import Template
 
-distVersion   = 1
+distVersion   = 2
 latest_url    = "https://api.github.com/repos/syncthing/syncthing/releases/latest"
 infoPlist     = 'syncthing/Info.plist'
 infoPlistTmpl = 'syncthing/Info.plist.tmpl'

syncthing/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.29.2-1</string>
+	<string>1.29.2-2</string>
 	<key>CFBundleVersion</key>
-	<string>102900201</string>
+	<string>102900202</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

syncthing/STApplication.m

@@ -76,7 +76,6 @@ - (void)applicationLoadConfiguration {
 	    _executable = [NSString stringWithFormat:@"%@/%@",
                        [[NSBundle mainBundle] resourcePath],
                        @"syncthing/syncthing"];
-		[defaults setValue:_executable forKey:@"Executable"];
 	}
 
     _syncthing.URI = [defaults stringForKey:@"URI"];
@@ -203,7 +202,7 @@ - (void)refreshDevices {
         self.toggleAllDevicesItem.title = @"Pause All Devices";
         [[self statusMonitor] setCurrentStatus:SyncthingStatusIdle];
     }
-    
+
     self.devicesPaused = allPaused;
 }