actions/setup-haskell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't unnecessarily split args

Browse Source
This commit is contained in:
Jared Weakly
2020-03-27 17:59:12 -07:00
parent d3ac0a8114
commit 5fd55ef5c0
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dist/index.js vendored
View File

@@ -8658,9 +8658,16 @@ async function installTool(tool, version) {
} }
} }
if (process.platform === 'win32') { if (process.platform === 'win32') {
const cmd = ['choco', 'install', tool, '--version', version]; await exec_1.exec('powershell', [
const flags = ['-m', '--no-progress', '-r']; 'choco',
await exec_1.exec('powershell', cmd.concat(flags)); 'install',
tool,
'--version',
version,
'-m',
'--no-progress',
'-r'
]);
core.addPath(path_1.join(process.env.ChocolateyInstall || '', 'lib', `${tool}.${version}`, 'tools', `${tool}-${version}`, tool === 'ghc' ? 'bin' : '')); core.addPath(path_1.join(process.env.ChocolateyInstall || '', 'lib', `${tool}.${version}`, 'tools', `${tool}-${version}`, tool === 'ghc' ? 'bin' : ''));
} }
else { else {

13
src/installer.ts
View File

@@ -131,9 +131,16 @@ async function installTool(tool: Tool, version: string): Promise<void> {
} }
if (process.platform === 'win32') { if (process.platform === 'win32') {
const cmd = ['choco', 'install', tool, '--version', version]; await exec('powershell', [
const flags = ['-m', '--no-progress', '-r']; 'choco',
await exec('powershell', cmd.concat(flags)); 'install',
tool,
'--version',
version,
'-m',
'--no-progress',
'-r'
]);
core.addPath( core.addPath(
join( join(