Merge pull request #225 from netease-youdao/fix/windows-gitbash

fix: 修复 Windows 端提示缺少 git bash 的问题

Author: fisherdaddy

scripts/electron-builder-hooks.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const { existsSync, readdirSync, statSync } = require('fs');
+const { existsSync, mkdirSync, readdirSync, statSync } = require('fs');
 const { spawnSync } = require('child_process');
 const { ensurePortableGit } = require('./setup-mingit.js');
 const { ensurePortablePythonRuntime, checkRuntimeHealth } = require('./setup-python-runtime.js');
@@ -29,6 +29,40 @@ function findPackagedBash(appOutDir) {
   return null;
 }
 
+function verifyPackagedPortableGitRuntimeDirs(appOutDir) {
+  const requiredDirs = [
+    path.join(appOutDir, 'resources', 'mingit', 'dev', 'shm'),
+    path.join(appOutDir, 'resources', 'mingit', 'dev', 'mqueue'),
+  ];
+  const createdDirs = [];
+
+  for (const dir of requiredDirs) {
+    if (existsSync(dir)) continue;
+    mkdirSync(dir, { recursive: true });
+    createdDirs.push(dir);
+  }
+
+  const missingDirs = requiredDirs.filter((dir) => !existsSync(dir));
+  if (missingDirs.length > 0) {
+    throw new Error(
+      'Windows package is missing required PortableGit runtime directories. '
+      + `Missing: ${missingDirs.join(', ')}`
+    );
+  }
+
+  if (createdDirs.length > 0) {
+    console.log(
+      '[electron-builder-hooks] Created missing PortableGit runtime directories: '
+      + createdDirs.join(', ')
+    );
+  }
+
+  console.log(
+    '[electron-builder-hooks] Verified PortableGit runtime directories: '
+    + requiredDirs.join(', ')
+  );
+}
+
 function findPackagedPythonExecutable(appOutDir) {
   const candidates = [
     path.join(appOutDir, 'resources', 'python-win', 'python.exe'),
@@ -380,6 +414,7 @@ async function afterPack(context) {
     }
 
     console.log(`[electron-builder-hooks] Verified bundled PortableGit: ${bashPath}`);
+    verifyPackagedPortableGitRuntimeDirs(context.appOutDir);
 
     const pythonExe = findPackagedPythonExecutable(context.appOutDir);
     if (!pythonExe) {

scripts/setup-mingit.js

@@ -26,6 +26,10 @@ const DEFAULT_PORTABLE_GIT_URL =
 const PROJECT_ROOT = path.resolve(__dirname, '..');
 const OUTPUT_DIR = path.join(PROJECT_ROOT, 'resources', 'mingit');
 const DEFAULT_ARCHIVE_PATH = path.join(PROJECT_ROOT, 'resources', PORTABLE_GIT_FILE);
+const RUNTIME_DIRS = [
+  path.join('dev', 'shm'),
+  path.join('dev', 'mqueue'),
+];
 
 const DIRS_TO_PRUNE = [
   'doc',
@@ -176,6 +180,27 @@ function extractArchive(archivePath) {
   }
 }
 
+function ensurePortableGitRuntimeDirs(required) {
+  const ensured = [];
+  for (const relPath of RUNTIME_DIRS) {
+    const fullPath = path.join(OUTPUT_DIR, relPath);
+    try {
+      fs.mkdirSync(fullPath, { recursive: true });
+      ensured.push(relPath);
+    } catch (error) {
+      const message = `Could not create runtime directory ${relPath}: ${error instanceof Error ? error.message : String(error)}`;
+      if (required) {
+        throw new Error(message);
+      }
+      console.warn(`[setup-mingit] Warning: ${message}`);
+    }
+  }
+
+  if (ensured.length > 0) {
+    console.log(`[setup-mingit] Ensured runtime directories: ${ensured.join(', ')}`);
+  }
+}
+
 async function resolveArchive(required) {
   const envArchive = resolveInputPath(process.env.LOBSTERAI_PORTABLE_GIT_ARCHIVE);
   if (envArchive) {
@@ -233,6 +258,7 @@ async function ensurePortableGit(options = {}) {
 
   const existingBash = findPortableGitBash();
   if (existingBash) {
+    ensurePortableGitRuntimeDirs(required);
     console.log(`[setup-mingit] PortableGit already prepared: ${existingBash}`);
     return { ok: true, skipped: false, bashPath: existingBash };
   }
@@ -251,6 +277,7 @@ async function ensurePortableGit(options = {}) {
     );
   }
 
+  ensurePortableGitRuntimeDirs(required);
   pruneUnneededFiles();
 
   const finalSize = getDirSize(OUTPUT_DIR);

src/main/libs/coworkUtil.ts

@@ -278,9 +278,21 @@ function checkWindowsGitBashHealth(bashPath: string): { ok: boolean; reason?: st
       };
     }
 
-    const output = (result.stdout || '').trim();
-    if (!output.startsWith('/')) {
-      return { ok: false, reason: `unexpected cygpath output: ${output || '(empty)'}` };
+    const stdout = (result.stdout || '').trim();
+    const stderr = (result.stderr || '').trim();
+    const lines = stdout
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+      .filter(Boolean);
+    const lastNonEmptyLine = lines.length > 0 ? lines[lines.length - 1] : '';
+
+    // Some Git Bash builds may print runtime warnings before the actual cygpath
+    // output (for example, missing /dev/shm or /dev/mqueue directories).
+    // Accept the check when the final non-empty line is a valid POSIX path.
+    if (!/^\/[a-zA-Z]\//.test(lastNonEmptyLine)) {
+      const diagnosticStdout = truncateDiagnostic(stdout || '(empty)');
+      const diagnosticStderr = stderr ? `, stderr: ${truncateDiagnostic(stderr)}` : '';
+      return { ok: false, reason: `unexpected cygpath output: ${diagnosticStdout}${diagnosticStderr}` };
     }
 
     return { ok: true };