actions
/
setup-cpp
Template
mirror of https://github.com/aminya/setup-cpp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: fix choco path

This commit is contained in:
Amin Yahyaabadi 2021-09-16 17:44:13 -05:00
parent df6ee47b06
commit 6925e1f02c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/chocolatey/chocolatey.ts
View File

@ -1,5 +1,7 @@
/* eslint-disable require-atomic-updates */
import { exec } from "@actions/exec" import { exec } from "@actions/exec"
import { existsSync } from "fs" import { existsSync } from "fs"
import { dirname } from "path"
import which from "which" import which from "which"
import { InstallationInfo } from "../utils/setup/setupBin" import { InstallationInfo } from "../utils/setup/setupBin"
@ -36,8 +38,12 @@ export async function setupChocolatey(
throw new Error(`Failed to install chocolatey`) throw new Error(`Failed to install chocolatey`)
} }
// eslint-disable-next-line require-atomic-updates const maybeChoco = which.sync("choco", { nothrow: true })
binDir = which.sync("choco", { nothrow: true }) ?? "C:\\ProgramData\\Chocolatey\\bin\\" if (maybeChoco !== null) {
binDir = dirname(maybeChoco)
} else {
binDir = "C:\\ProgramData\\Chocolatey\\bin\\"
}
if (existsSync(binDir)) { if (existsSync(binDir)) {
return { binDir } return { binDir }