Preparing for 2.1.10 release

Author: ttscoff

.gitsecret/paths/mapping.cfg

@@ -1 +1 @@
-buildnotes.md:7abf1ca949be13a9a4045a2c3c3502088f9ff1432bdb70536a4b3aaa42713c72
+buildnotes.md:f40b30c2fcc3dd898720f3b4a5fe36b5f48bbdbc8322639cbe2e5c5ecb639993

CHANGELOG.md

@@ -1,3 +1,5 @@
+## 2.1.10
+
 ## 2.1.9
 
 ## 2.1.8

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.8"
+  version "2.1.9"
   license "MIT"
 
   on_macos do
     url "https://github.com/ttscoff/gather-cli/releases/download/v#{version}/gather-cli-#{version}-macos-universal.tar.gz"
-    sha256 "0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5"
+    sha256 "5a3d5922ebe5b5a936cd1276534c20811d184be68836526d54a9c036651df2e5"
   end
 
   def install

README.md

@@ -3,7 +3,7 @@
 ![Howzit banner image](https://cdn3.brettterpstra.com/uploads/2022/08/gatherheader-rb.webp)
 
 
-Current version: 2.1.9
+Current version: 2.1.10
 
 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.
 

Sources/gather/gather.swift

@@ -5,7 +5,7 @@ import Foundation
 import HTML2Text
 import Readability
 import Yams
-var VERSION = "2.1.9"
+var VERSION = "2.1.10"
 
 var acceptedAnswerOnly = false
 var disableReadability = false

scripts/package.sh

@@ -103,19 +103,24 @@ pkgpath="$builddir/$productname-$version.pkg"
 
 echo "## building pkg: $pkgpath"
 
-# Check if installer signing identity is provided and exists
+# Check if installer signing identity is provided
 if [ -n "$INSTALLER_SIGNATURE" ] && [ "$INSTALLER_SIGNATURE" != "-" ]; then
-	if security find-identity -v -p codesigning | grep -q "$INSTALLER_SIGNATURE"; then
-		echo "## Signing PKG with: $INSTALLER_SIGNATURE"
-		pkgbuild --root "$pkgroot" \
-			--version "$version" \
-			--identifier "$identifier" \
-			--sign "$INSTALLER_SIGNATURE" \
-			"$pkgpath"
+	# Try to use the certificate directly - pkgbuild can use installer certs
+	# even if they don't show up in security find-identity
+	echo "## Attempting to sign PKG with: $INSTALLER_SIGNATURE"
+	if pkgbuild --root "$pkgroot" \
+		--version "$version" \
+		--identifier "$identifier" \
+		--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
 	else
-		echo "## Warning: Installer identity '$INSTALLER_SIGNATURE' not found, building unsigned pkg"
+		PKG_BUILD_EXIT=$?
+		echo "## Warning: Failed to sign with '$INSTALLER_SIGNATURE' (exit code: $PKG_BUILD_EXIT), building unsigned pkg"
+		# Remove the failed signed package and build unsigned
+		rm -f "$pkgpath"
 		pkgbuild --root "$pkgroot" \
 			--version "$version" \
 			--identifier "$identifier" \

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.8<!--END VER-->
+Current version: <!--VER-->2.1.9<!--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.