Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-07 13:59:28 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Address code review: add helper function and verify bash execution

Browse Source 
Co-authored-by: DeJeune <67425183+DeJeune@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-12-02 12:42:32 +00:00
parent 8ecd69eb0f
commit 0d6532eba0
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/ipc.ts
View File

@ -500,6 +500,9 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
const { execSync } = require('child_process') const { execSync } = require('child_process')
// Helper function to get first path from `where` command output
const getFirstPath = (output: string): string => output.trim().split('\n')[0]
try { try {
// Check common Git Bash installation paths // Check common Git Bash installation paths
const commonPaths = [ const commonPaths = [
@ -520,7 +523,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
try { try {
const bashLocation = execSync('where bash.exe', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }) const bashLocation = execSync('where bash.exe', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] })
if (bashLocation && bashLocation.trim()) { if (bashLocation && bashLocation.trim()) {
logger.debug('Git Bash found in PATH', { path: bashLocation.trim().split('\n')[0] }) logger.debug('Git Bash found in PATH', { path: getFirstPath(bashLocation) })
return true return true
} }
} catch { } catch {
@ -532,7 +535,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
const gitLocation = execSync('where git.exe', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }) const gitLocation = execSync('where git.exe', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] })
if (gitLocation && gitLocation.trim()) { if (gitLocation && gitLocation.trim()) {
// git.exe is typically in Git/cmd or Git/bin, bash.exe is in Git/bin // git.exe is typically in Git/cmd or Git/bin, bash.exe is in Git/bin
const gitPath = gitLocation.trim().split('\n')[0] const gitPath = getFirstPath(gitLocation)
const gitDir = path.dirname(gitPath) const gitDir = path.dirname(gitPath)
// Try to find bash.exe relative to git.exe location // Try to find bash.exe relative to git.exe location
@ -550,10 +553,15 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
} }
} }
// Even if bash.exe is not found at expected locations, if git is available, // Verify bash is actually executable by trying to run it
// the user likely has a working Git installation that can be used try {
logger.debug('Git found in PATH, assuming Git Bash is available', { gitPath }) execSync('bash --version', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] })
return true logger.debug('Git Bash verified via bash --version', { gitPath })
return true
} catch {
// bash command failed, Git Bash may not be properly configured
logger.debug('Git found but bash command failed', { gitPath })
}
} }
} catch { } catch {
// Git not in PATH // Git not in PATH