Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-11 16:39:15 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

refactor(CodeToolsService): adjust command construction for Windows compatibility; streamline installation command handling

Browse Source
This commit is contained in:
kangfenmao 2025-08-19 18:10:10 +08:00
parent 70cc1c4a32
commit c5554995dd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/services/CodeToolsService.ts
View File

@ -3,6 +3,7 @@ import os from 'node:os'
import path from 'node:path'
import { loggerService } from '@logger'
import { isWin } from '@main/constant'
import { removeEnvProxy } from '@main/utils'
import { isUserInChina } from '@main/utils/ipService'
import { getBinaryName } from '@main/utils/process'
@ -295,7 +296,7 @@ class CodeToolsService {
}
// Build command to execute
let baseCommand = `${bunPath} ${executablePath}`
let baseCommand = isWin ? `${executablePath}` : `${bunPath} ${executablePath}`
const bunInstallPath = path.join(os.homedir(), '.cherrystudio')
if (isInstalled) {
@ -312,7 +313,7 @@ class CodeToolsService {
: `export BUN_INSTALL="${bunInstallPath}" && export NPM_CONFIG_REGISTRY="${registryUrl}" &&`
const installCommand = `${installEnvPrefix} ${bunPath} install -g ${packageName}`
baseCommand = `echo "Installing ${packageName}..." && ${installCommand} && echo "Installation complete, starting ${cliTool}..." && "${baseCommand}"`
baseCommand = `echo "Installing ${packageName}..." && ${installCommand} && echo "Installation complete, starting ${cliTool}..." && ${baseCommand}`
}
switch (platform) {
@ -334,8 +335,7 @@ end tell`
case 'win32': {
// Windows - Use temp bat file for debugging
const envPrefix = buildEnvPrefix(true)
let command = envPrefix ? `${envPrefix} && ${baseCommand}` : baseCommand
command = command.replace(bunPath, '')
const command = envPrefix ? `${envPrefix} && ${baseCommand}` : baseCommand
// Create temp bat file for debugging and avoid complex command line escaping issues
const tempDir = path.join(os.tmpdir(), 'cherrystudio')