cicy-desktop 2.1.148 → 2.1.150

package/.github/workflows/mac-app-release.yml

@@ -188,9 +188,12 @@ jobs:
           for ARCH in x64 arm64; do
             WANT="$([ "$ARCH" = x64 ] && echo x86_64 || echo arm64)"
             APP=""
-            for d in $(find dist -maxdepth 2 -type d -name "*.app"); do
-              if lipo -archs "$d/Contents/MacOS/"* 2>/dev/null | grep -qw "$WANT"; then APP="$d"; break; fi
-            done
+            # NUL-delimited: the .app dir name has a space ("CiCy Desktop.app"), so a
+            # `for d in $(find …)` word-splits the path and breaks. read -d '' is safe.
+            while IFS= read -r -d '' d; do
+              bin="$(find "$d/Contents/MacOS" -maxdepth 1 -type f | head -1)"
+              if lipo -archs "$bin" 2>/dev/null | grep -qw "$WANT"; then APP="$d"; break; fi
+            done < <(find dist -maxdepth 2 -type d -name "*.app" -print0)
             [ -n "$APP" ] || { echo "::warning::no $ARCH .app found, skipping"; continue; }
             echo "app installer $ARCH ← $APP"
             B="appbundle-$ARCH"; rm -rf "$B"; mkdir -p "$B"
@@ -200,4 +203,19 @@ jobs:
             tar -czf "$OUT" -C "$B" .
             gh release upload "${{ steps.meta.outputs.tag }}" "$OUT" --repo "$GITHUB_REPOSITORY" --clobber
             echo "uploaded $OUT ($(du -h "$OUT" | cut -f1))"
+
+            # Native .pkg installer (right-click Open once; the postinstall ad-hoc-signs
+            # + de-quarantines the installed app so it opens with no Apple cert).
+            ROOT="pkgroot-$ARCH"; rm -rf "$ROOT"; mkdir -p "$ROOT/Applications"
+            cp -R "$APP" "$ROOT/Applications/CiCy Desktop.app"
+            SCR="pkgscripts-$ARCH"; rm -rf "$SCR"; mkdir -p "$SCR"
+            cp scripts/mac-allinone/postinstall "$SCR/postinstall"; chmod +x "$SCR/postinstall"
+            PKG="cicy-desktop-$VER-$ARCH.pkg"
+            if pkgbuild --root "$ROOT" --scripts "$SCR" --identifier com.cicy.desktop \
+                 --version "$VER" --install-location / "$PKG"; then
+              gh release upload "${{ steps.meta.outputs.tag }}" "$PKG" --repo "$GITHUB_REPOSITORY" --clobber
+              echo "uploaded $PKG ($(du -h "$PKG" | cut -f1))"
+            else
+              echo "::warning::pkgbuild failed for $ARCH (other arch unaffected)"
+            fi
           done

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.148",
+  "version": "2.1.150",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {

package/scripts/mac-allinone/install.command

@@ -45,6 +45,9 @@ xattr -cr "$DEST_APP" 2>/dev/null || true
 codesign --force --deep --sign - "$DEST_APP" 2>/dev/null || \
   echo "    (codesign 警告可忽略,quarantine 已清即可打开)"
 
+# 桌面快捷方式(主人: 要快捷方式)+ 启动台/Spotlight 已自动收录(在 /Applications 里)
+ln -sfn "$DEST_APP" "$HOME/Desktop/$APP_NAME.app" 2>/dev/null && echo "==> 桌面快捷方式已建" || true
+
 # ── 3) (可选)预暂存 docker 包 —— 仅当 bundle 里带了 docker/ 时(全离线包)。
 #      app-only 包没有这个目录:跳过,docker 由 app 运行时联网装(一次,之后复用)。
 DISK_SRC="$HERE/docker/ubuntu-2404-$DTAG-docker.raw.gz"

package/scripts/mac-allinone/postinstall

@@ -0,0 +1,23 @@
+#!/bin/bash
+# Runs as root right after the .pkg lays down /Applications/CiCy Desktop.app.
+# The app is unsigned-but-ad-hoc (no Apple cert). pkg-installed files normally
+# aren't quarantined, but strip any quarantine + re-ad-hoc-sign to be safe so the
+# app opens without "已损坏 / unidentified developer". Best-effort — never fail install.
+APP="/Applications/CiCy Desktop.app"
+[ -d "$APP" ] || exit 0
+/usr/bin/xattr -dr com.apple.quarantine "$APP" 2>/dev/null || true
+/usr/bin/xattr -cr "$APP" 2>/dev/null || true
+/usr/bin/codesign --force --deep --sign - "$APP" 2>/dev/null || true
+
+# Desktop shortcut for the logged-in user (postinstall runs as root, so resolve the
+# console user + their home and chown the symlink to them). Launchpad/Spotlight pick
+# the app up automatically from /Applications.
+CUSER="$(/usr/bin/stat -f%Su /dev/console 2>/dev/null)"
+if [ -n "$CUSER" ] && [ "$CUSER" != "root" ]; then
+  UHOME="$(/usr/bin/dscl . -read "/Users/$CUSER" NFSHomeDirectory 2>/dev/null | awk '{print $2}')"
+  if [ -d "$UHOME/Desktop" ]; then
+    /bin/ln -sfn "$APP" "$UHOME/Desktop/CiCy Desktop.app" 2>/dev/null || true
+    /usr/sbin/chown -h "$CUSER:staff" "$UHOME/Desktop/CiCy Desktop.app" 2>/dev/null || true
+  fi
+fi
+exit 0