Skip to content

Commit eb66818

Browse files
committed
replace ${userRoot} to ${userHome}
1 parent 8cc2184 commit eb66818

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
"type": "string",
263263
"scope": "resource",
264264
"markdownDescription": "%settings.cppcheck.exec.path%",
265-
"default": "${userRoot}/.eide/tools/cppcheck/cppcheck.exe"
265+
"default": "${userHome}/.eide/tools/cppcheck/cppcheck.exe"
266266
},
267267
"EIDE.Builder.ThreadNumber": {
268268
"type": "integer",
@@ -381,13 +381,13 @@
381381
"type": "string",
382382
"scope": "resource",
383383
"markdownDescription": "gnu sdcc for stm8 installation path",
384-
"default": "${userRoot}/.eide/tools/stm8_gnu_sdcc"
384+
"default": "${userHome}/.eide/tools/stm8_gnu_sdcc"
385385
},
386386
"EIDE.STM8.COSMIC.InstallDirectory": {
387387
"type": "string",
388388
"scope": "resource",
389389
"markdownDescription": "COSMIC CXSTM8 root folder path",
390-
"default": "${userRoot}/.eide/tools/cosmic_stm8"
390+
"default": "${userHome}/.eide/tools/cosmic_stm8"
391391
},
392392
"EIDE.ARM.ARMCC5.InstallDirectory": {
393393
"type": "string",
@@ -411,13 +411,13 @@
411411
"type": "string",
412412
"scope": "resource",
413413
"markdownDescription": "%settings.arm.gcc.install.folder%",
414-
"default": "${userRoot}/.eide/tools/gcc_arm"
414+
"default": "${userHome}/.eide/tools/gcc_arm"
415415
},
416416
"EIDE.ARM.LLVM.InstallDirectory": {
417417
"type": "string",
418418
"scope": "resource",
419419
"markdownDescription": "%settings.arm.llvm.install.folder%",
420-
"default": "${userRoot}/.eide/tools/llvm_arm"
420+
"default": "${userHome}/.eide/tools/llvm_arm"
421421
},
422422
"EIDE.ARM.INI.Path": {
423423
"type": "string",
@@ -429,19 +429,19 @@
429429
"type": "string",
430430
"scope": "resource",
431431
"markdownDescription": "%settings.jlink.install.folder%",
432-
"default": "${userRoot}/.eide/tools/jlink"
432+
"default": "${userHome}/.eide/tools/jlink"
433433
},
434434
"EIDE.OpenOCD.ExePath": {
435435
"type": "string",
436436
"scope": "resource",
437437
"markdownDescription": "%settings.openocd.install.folder%",
438-
"default": "${userRoot}/.eide/tools/openocd/bin/openocd.exe"
438+
"default": "${userHome}/.eide/tools/openocd/bin/openocd.exe"
439439
},
440440
"EIDE.STLink.ExePath": {
441441
"type": "string",
442442
"scope": "resource",
443443
"markdownDescription": "%settings.stlink.install.folder%",
444-
"default": "${userRoot}/.eide/tools/st_cube_programer/bin/STM32_Programmer_CLI.exe"
444+
"default": "${userHome}/.eide/tools/st_cube_programer/bin/STM32_Programmer_CLI.exe"
445445
},
446446
"EIDE.ARM.Option.AutoGenerateRTE_Components": {
447447
"type": "boolean",
@@ -459,7 +459,7 @@
459459
"type": "string",
460460
"scope": "resource",
461461
"markdownDescription": "%settings.stvp.path%",
462-
"default": "${userRoot}/.eide/tools/stvp/STVP_CmdLine.exe"
462+
"default": "${userHome}/.eide/tools/stvp/STVP_CmdLine.exe"
463463
},
464464
"EIDE.C51.INI.Path": {
465465
"type": "string",
@@ -471,13 +471,13 @@
471471
"type": "string",
472472
"scope": "resource",
473473
"markdownDescription": "%settings.sdcc.install.folder%",
474-
"default": "${userRoot}/.eide/tools/sdcc"
474+
"default": "${userHome}/.eide/tools/sdcc"
475475
},
476476
"EIDE.RISCV.InstallDirectory": {
477477
"type": "string",
478478
"scope": "resource",
479479
"markdownDescription": "%settings.riscv.gcc.install.folder%",
480-
"default": "${userRoot}/.eide/tools/gcc_riscv"
480+
"default": "${userHome}/.eide/tools/gcc_riscv"
481481
},
482482
"EIDE.RISCV.ToolPrefix": {
483483
"type": "string",

src/ResInstaller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ export class ResInstaller {
464464

465465
// update eide settings
466466
if (toolInfo.setting_name) {
467-
let setting_val = ['${userRoot}', '.eide', 'tools', resourceName].join(File.sep);
467+
let setting_val = ['${userHome}', '.eide', 'tools', resourceName].join(File.sep);
468468
setting_val = toolInfo.require_name ? `${setting_val}/${toolInfo.require_name}` : setting_val;
469469
SettingManager.GetInstance().setConfigValue(toolInfo.setting_name, File.ToUnixPath(setting_val));
470470
}

0 commit comments

Comments
 (0)