feat: mac自动更新方式修改

Author: yexinf

.github/workflows/release.yml

@@ -76,7 +76,7 @@ jobs:
           mv Oadin.app pkgroot/Oadin/Oadin.app
           chmod +x installer/mac/preinstall
           chmod +x installer/mac/postinstall
-          chmod +x installer/mac/uninstall.sh
+          chmod +x installer/mac/uninstall
           # 添加文件大小检查
           echo "=== Mac 二进制文件详细信息 ==="
           # echo "二进制文件大小: $(du -h pkgroot/Oadin/oadin | cut -f1)"

installer/mac/create-app.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-exec > /tmp/oadin_createapp.log 2>&1
 set -e
 
 APP_NAME="Oadin"
@@ -81,7 +80,7 @@ cat > "Oadin.app/Contents/Info.plist" << EOF
     <key>LSMinimumSystemVersion</key>
     <string>11.0</string>
     <key>LSUIElement</key>
-    <false/>
+    <true/>
     <key>NSHighResolutionCapable</key>
     <true/>
     <key>NSHumanReadableCopyright</key>

installer/mac/postinstall

@@ -46,10 +46,8 @@ if [ "$REAL_USER" != "root" ] && [ -n "$REAL_USER" ]; then
             source ~/.bashrc
         fi
         export HOME=\"$USER_HOME\"
-        # 必须用 Finder 双击 .app 或 open Oadin.app 启动，不能用终端 ./Oadin.app/Contents/MacOS/oadin-app 直接运行，否则 macOS 依然认为你是“无界面进程”。
-        # \"${MACOS_DIR}/oadin-app\" &
+        \"${MACOS_DIR}/oadin-app\" &
     "
-    open "/Applications/Oadin.app" &
     echo "Oadin installation completed successfully"
 else
     echo "Warning: Cannot determine real user, skipping auto-launch"

installer/mac/preinstall

@@ -26,16 +26,8 @@ if [ -d "$APP_PATH" ]; then
         fi
         sleep 2
 
-        # pkill -f "oadin" 2>/dev/null || true
-        # pkill -f "Oadin AI Service Manager" 2>/dev/null || true
-        # 支持覆盖更新
-        MY_PID=$$
-        MY_PARENT_PID=$(ps -o ppid= -p $$ | tr -d ' ')
-        for pid in $(pgrep -f "Oadin AI Service Manager"); do
-            if [ "$pid" != "$MY_PID" ] && [ "$pid" != "$MY_PARENT_PID" ]; then
-                kill -9 "$pid" 2>/dev/null || true
-            fi
-        done
+        pkill -f "oadin" 2>/dev/null || true
+        pkill -f "Oadin AI Service Manager" 2>/dev/null || true
 
         sleep 2
 

installer/mac/uninstall.sh installer/mac/uninstallinstaller/mac/uninstall.sh renamed to installer/mac/uninstall

@@ -1,4 +1,5 @@
 #!/bin/bash
+exec > /tmp/oadin_uninstall.log 2>&1
 set -e
 
 APP_BUNDLE="/Applications/Oadin.app"

tray/updater.go

@@ -399,34 +399,33 @@ func (p *PKGInstaller) Install() error {
 }
 
 func (p *PKGInstaller) installWithAppleScript() error {
-	slog.Info("installing with AppleScript for elevated privileges",)
-	// 使用AppleScript请求管理员权限并执行安装
-	script := fmt.Sprintf(`
-		set pkgPath to "%s"
-		set installCommand to "installer -pkg " & quoted form of pkgPath & " -target /"
-		try
-			do shell script installCommand with administrator privileges
-			return "INSTALL_SUCCESS"
-		on error errMsg number errNum
-			return "INSTALL_FAILED: " & errMsg & " (错误码: " & errNum & ")"
-		end try
-    `, p.pkgPath)
-
-	cmd := exec.Command("osascript", "-e", script)
-
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		slog.Error("AppleScript execution failed:", err)
-		return fmt.Errorf("AppleScript excute failed: %v", err)
-	}
+   slog.Info("installing with AppleScript for elevated privileges")
 
-	slog.Info("AppleScript output:", "output", string(output))
-	if !strings.Contains(string(output), "INSTALL_SUCCESS") {
-		return fmt.Errorf("installation failed via AppleScript: %s", string(output))
-	}
+    // 弹出提示框，询问用户是否打开安装包目录
+    alertScript := fmt.Sprintf(`
+        display dialog "需要手动安装新版本。是否打开安装包所在目录？" buttons {"取消", "打开目录"} default button "打开目录"
+    `, p.pkgPath)
 
-	slog.Info("install successfully via AppleScript")
-	return nil
+    cmd := exec.Command("osascript", "-e", alertScript)
+    output, err := cmd.CombinedOutput()
+    if err != nil {
+        slog.Error("AppleScript alert failed:", err)
+        return fmt.Errorf("AppleScript alert failed: %v", err)
+    }
+
+    if !strings.Contains(string(output), "打开目录") {
+        return fmt.Errorf("用户取消了安装")
+    }
+
+    // 打开安装包所在目录
+    dir := filepath.Dir(p.pkgPath)
+    openCmd := exec.Command("open", dir)
+    if err := openCmd.Run(); err != nil {
+        slog.Error("打开目录失败:", err)
+        return fmt.Errorf("打开目录失败: %v", err)
+    }
+
+    return fmt.Errorf("请手动双击安装包进行安装")
 }
 
 func (p *PKGInstaller) VerifyInstallation() error {