Deploy fixes

@fixed PKG signing

Author: ttscoff

Formula/gather-cli.rb

@@ -7,12 +7,12 @@
 class GatherCli < Formula
   desc "Readability and Markdown utility for saving web urls and HTML text"
   homepage "https://brettterpstra.com/projects/gather-cli/"
-  version "2.1.9"
+  version "2.1.10"
   license "MIT"
 
   on_macos do
     url "https://github.com/ttscoff/gather-cli/releases/download/v#{version}/gather-cli-#{version}-macos-universal.tar.gz"
-    sha256 "5a3d5922ebe5b5a936cd1276534c20811d184be68836526d54a9c036651df2e5"
+    sha256 "55fe5e2243bfb0166a04f8e3234c02d012e510fe7776e7fc770231cee2884119"
   end
 
   def install

scripts/package.sh

@@ -79,20 +79,22 @@ notarizefile() { # $1: path to file to notarize, $2: identifier
 xcrun swift build -c release --arch arm64 --arch x86_64
 bindir=$(xcrun swift build -c release --arch arm64 --arch x86_64 --show-bin-path)
 
-# Determine signing identity (allow override via environment variable)
-APP_SIGNING_IDENTITY="${APP_SIGNING_IDENTITY:-Developer ID Installer: Brett Terpstra (47TRS7H4BH)}"
+# Determine signing identity for binary (allow override via environment variable)
+# Default to 3rd Party Mac Developer Application (for Mac App Store) or Developer ID Application (for direct distribution)
+APP_SIGNING_IDENTITY="${APP_SIGNING_IDENTITY:-3rd Party Mac Developer Application: Brett Terpstra (47TRS7H4BH)}"
+
+# Initialize notarization flag - will be set based on PKG signing success
+SKIP_NOTARIZATION=true
 
 # Check if the identity exists, if not use ad-hoc signing
 if security find-identity -v -p codesigning | grep -q "$APP_SIGNING_IDENTITY"; then
-	echo "## Signing with: $APP_SIGNING_IDENTITY"
+	echo "## Signing binary with: $APP_SIGNING_IDENTITY"
 	codesign --force --verbose --sign "$APP_SIGNING_IDENTITY" -o runtime --timestamp $bindir/$executable
 	codesign --verify -vvvv $bindir/$executable
-	SKIP_NOTARIZATION=false
 else
-	echo "## Warning: Identity '$APP_SIGNING_IDENTITY' not found, using ad-hoc signing"
+	echo "## Warning: Identity '$APP_SIGNING_IDENTITY' not found, using ad-hoc signing for binary"
 	codesign --force --verbose --sign "-" $bindir/$executable
 	codesign --verify -vvvv $bindir/$executable
-	SKIP_NOTARIZATION=true
 fi
 
 rm -rf package
@@ -114,8 +116,8 @@ if [ -n "$INSTALLER_SIGNATURE" ] && [ "$INSTALLER_SIGNATURE" != "-" ]; then
 		--sign "$INSTALLER_SIGNATURE" \
 		"$pkgpath" 2>&1; then
 		echo "## ✓ PKG signed successfully"
-		# PKG is signed, can be notarized (if binary was also properly signed)
-		# SKIP_NOTARIZATION remains false if binary was signed, true if ad-hoc
+		# PKG is signed with Developer ID Installer, can be notarized
+		SKIP_NOTARIZATION=false
 	else
 		PKG_BUILD_EXIT=$?
 		echo "## Warning: Failed to sign with '$INSTALLER_SIGNATURE' (exit code: $PKG_BUILD_EXIT), building unsigned pkg"

src/_README.md

@@ -3,7 +3,7 @@
 <!--README--><!--GITHUB-->![Howzit banner image](https://cdn3.brettterpstra.com/uploads/2022/08/gatherheader-rb.webp)<!--END GITHUB-->
 <!--JEKYLL{% img aligncenter 800 220 /uploads/2022/08/gatherheader-rb.jpg "Howzit banner image" %}-->
 
-Current version: <!--VER-->2.1.9<!--END VER-->
+Current version: <!--VER-->2.1.10<!--END VER-->
 
 This project is the successor to read2text, which was a Python based tool that used Arc90 Readability and html2text to convert web URLs to Markdown documents, ready to store in your notes. It takes its name from another of my similar projects that I've since retired. It was this, but with a GUI, and this is infinitely more scriptable and is designed to nestle into your favorite tools and projects.