Skip to content

Commit d4fbb69

Browse files
committed
format
1 parent 5d792c9 commit d4fbb69

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

src/main/services/CodeToolsService.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import os from 'node:os'
33
import path from 'node:path'
44

55
import { loggerService } from '@logger'
6-
import { isMac,isWin } from '@main/constant'
6+
import { isMac, isWin } from '@main/constant'
77
import { removeEnvProxy } from '@main/utils'
88
import { isUserInChina } from '@main/utils/ipService'
99
import { getBinaryName } from '@main/utils/process'
@@ -297,8 +297,7 @@ class CodeToolsService {
297297
*/
298298
private async getTerminalConfig(terminalId?: string): Promise<TerminalConfigWithCommand> {
299299
const availableTerminals = await this.getAvailableTerminals()
300-
const terminalCommands =
301-
isWin ? WINDOWS_TERMINALS_WITH_COMMANDS : MACOS_TERMINALS_WITH_COMMANDS
300+
const terminalCommands = isWin ? WINDOWS_TERMINALS_WITH_COMMANDS : MACOS_TERMINALS_WITH_COMMANDS
302301
const defaultTerminal = isWin ? terminalApps.cmd : terminalApps.systemDefault
303302

304303
if (terminalId) {
@@ -491,10 +490,9 @@ class CodeToolsService {
491490
const bunInstallPath = path.join(os.homedir(), '.cherrystudio')
492491
const registryUrl = await this.getNpmRegistryUrl()
493492

494-
const installEnvPrefix =
495-
isWin
496-
? `set "BUN_INSTALL=${bunInstallPath}" && set "NPM_CONFIG_REGISTRY=${registryUrl}" &&`
497-
: `export BUN_INSTALL="${bunInstallPath}" && export NPM_CONFIG_REGISTRY="${registryUrl}" &&`
493+
const installEnvPrefix = isWin
494+
? `set "BUN_INSTALL=${bunInstallPath}" && set "NPM_CONFIG_REGISTRY=${registryUrl}" &&`
495+
: `export BUN_INSTALL="${bunInstallPath}" && export NPM_CONFIG_REGISTRY="${registryUrl}" &&`
498496

499497
const updateCommand = `${installEnvPrefix} "${bunPath}" install -g ${packageName}`
500498
logger.info(`Executing update command: ${updateCommand}`)

src/renderer/src/store/codeTools.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface CodeToolsState {
1616
directories: string[]
1717
// 当前选择的目录
1818
currentDirectory: string
19-
// 选择的终端 ( macOS)
19+
// 选择的终端 ( macOS 和 Windows)
2020
selectedTerminal: string
2121
}
2222

0 commit comments

Comments
 (0)