diff --git a/src/chocolatey/chocolatey.ts b/src/chocolatey/chocolatey.ts index 8f7d679f..c922b415 100644 --- a/src/chocolatey/chocolatey.ts +++ b/src/chocolatey/chocolatey.ts @@ -42,7 +42,7 @@ export async function setupChocolatey( if (maybeChoco !== null) { binDir = dirname(maybeChoco) } else { - binDir = "C:\\ProgramData\\Chocolatey\\bin\\" + binDir = "C:/ProgramData/Chocolatey/bin/" } if (existsSync(binDir)) { diff --git a/src/cppcheck/__tests__/cppcheck.test.ts b/src/cppcheck/__tests__/cppcheck.test.ts index 6e96734e..78785be8 100644 --- a/src/cppcheck/__tests__/cppcheck.test.ts +++ b/src/cppcheck/__tests__/cppcheck.test.ts @@ -1,12 +1,11 @@ import { setupCppcheck } from "../cppcheck" import { testBin } from "../../utils/tests/test-helpers" -import { InstallationInfo } from "../../utils/setup/setupBin" jest.setTimeout(200000) describe("setup-cppcheck", () => { it("should setup cppcheck", async () => { const installInfo = await setupCppcheck("", "", process.arch) - await testBin("cppcheck", ["--version"], (installInfo as InstallationInfo | undefined)?.binDir) + await testBin("cppcheck", ["--version"], installInfo.binDir) }) }) diff --git a/src/cppcheck/cppcheck.ts b/src/cppcheck/cppcheck.ts index bec183c1..ea6bdfd8 100644 --- a/src/cppcheck/cppcheck.ts +++ b/src/cppcheck/cppcheck.ts @@ -8,7 +8,7 @@ export async function setupCppcheck(version: string | undefined, _setupCppDir: s switch (process.platform) { case "win32": { await setupChocoPack("cppcheck", version) - const binDir = "C:\\Program Files\\Cppcheck" + const binDir = "C:/Program Files/Cppcheck" addPath(binDir) return { binDir } } diff --git a/src/doxygen/doxygen.ts b/src/doxygen/doxygen.ts index 0e195475..3fd28cef 100644 --- a/src/doxygen/doxygen.ts +++ b/src/doxygen/doxygen.ts @@ -9,8 +9,8 @@ export async function setupDoxygen(version: string | undefined, _setupCppDir: st case "win32": { await setupChocoPack("graphviz", version) await setupChocoPack("doxygen.install", version) - addPath("C:\\Program Files\\Graphviz\\bin") - const binDir = "C:\\Program Files\\doxygen\\bin" + addPath("C:/Program Files/Graphviz/bin") + const binDir = "C:/Program Files/doxygen/bin" addPath(binDir) return { binDir } } diff --git a/src/gcc/gcc.ts b/src/gcc/gcc.ts index 1722b549..db43174d 100644 --- a/src/gcc/gcc.ts +++ b/src/gcc/gcc.ts @@ -15,11 +15,11 @@ export async function setupGcc(version: string, _setupCppDir: string, arch: stri await setupChocoPack("gcc-arm-embedded", version) } await setupChocoPack("mingw", version) - if (arch === "x64" && existsSync("C:\\tools\\mingw64\\bin")) { - binDir = "C:\\tools\\mingw64\\bin" + if (arch === "x64" && existsSync("C:/tools/mingw64/bin")) { + binDir = "C:/tools/mingw64/bin" addPath(binDir) - } else if (arch === "ia32" && existsSync("C:\\tools\\mingw32\\bin")) { - binDir = "C:\\tools\\mingw32\\bin" + } else if (arch === "ia32" && existsSync("C:/tools/mingw32/bin")) { + binDir = "C:/tools/mingw32/bin" addPath(binDir) } break diff --git a/src/msvc/msvc.ts b/src/msvc/msvc.ts index 2a483f04..2ac15a9c 100644 --- a/src/msvc/msvc.ts +++ b/src/msvc/msvc.ts @@ -38,7 +38,7 @@ export async function setupMSVC( toolset = "14.0.25420.1" await setupChocoPack("visualcpp-build-tools", toolset, ["--ignore-dependencies", "--params", "'/IncludeRequired'"]) - VCTargetsPath = "C:\\Program Files (x86)\\MSBuild\\Microsoft.Cpp\\v4.0\\v140" + VCTargetsPath = "C:/Program Files (x86)/MSBuild/Microsoft.Cpp/v4.0/v140" if (existsSync(VCTargetsPath)) { exportVariable("VCTargetsPath", VCTargetsPath) } @@ -48,14 +48,14 @@ export async function setupMSVC( "--package-parameters", "add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --passive", ]) - VCTargetsPath = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\MSBuild\\Microsoft\\VC\\v150" + VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/MSBuild/Microsoft/VC/v150" } else if (version === "2019") { toolset = "16.11.2.0" await setupChocoPack("visualstudio2019buildtools", toolset, [ "--package-parameters", "add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --passive", ]) - VCTargetsPath = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\MSBuild\\Microsoft\\VC\\v160" + VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Microsoft/VC/v160" } if (VCTargetsPath !== undefined && existsSync(VCTargetsPath)) { exportVariable("VCTargetsPath", VCTargetsPath) diff --git a/src/utils/setup/setupChocoPack.ts b/src/utils/setup/setupChocoPack.ts index 0e3cacc4..a2f3813f 100644 --- a/src/utils/setup/setupChocoPack.ts +++ b/src/utils/setup/setupChocoPack.ts @@ -24,5 +24,5 @@ export async function setupChocoPack(name: string, version?: string, args: strin throw new Error(`Failed to install ${name} ${version}`) } - return { binDir: "C:\\ProgramData\\Chocolatey\\bin\\" } + return { binDir: "C:/ProgramData/Chocolatey/bin/" } }