diff --git a/index.js b/index.js index a591e98..fed312a 100644 --- a/index.js +++ b/index.js @@ -55,12 +55,14 @@ try { if (winsdk != '') vsDevCmdArgs.push(`-winsdk=${winsdk}`) - const cmdArgs = [ '/q', '/k'].concat(vsDevCmdArgs, ['&&', 'set']) - + const cmdArgs = [ '/q', '/k' ].concat(vsDevCmdArgs, ['&&', 'set']) console.log(`$ cmd ${cmdArgs.join(' ')}`) + console.log("running ...") const cmdResult = spawn('cmd', cmdArgs, {encoding: 'utf8'}) + console.log(`cmdResult: ${cmdResult}`) if (cmdResult.error) throw cmdResult.error + const cmdOutput = cmdResult.output .filter(s => !!s) .map(s => s.split('\n')) @@ -71,25 +73,12 @@ try { const completeEnv = cmdOutput .filter(s => s.indexOf('=') != -1) .map(s => s.split('=', 2)) - const filteredEnv = completeEnv - .filter(([key, _]) => key != 'Path' && !process.env[key]) + const filteredEnv = completeEnv.filter(!process.env[key]) for (const [key, value] of filteredEnv) { + console.log(`Setting ${key} => ${value}`) core.exportVariable(key, value) } - - const pathEntries = process.env['Path'].split(';') - const newPathEntries = completeEnv - .filter(([key, _]) => key == 'Path') - .map(([_, value]) => value) - .join(';') - .split(';') - .filter(path => pathEntries.indexOf(path) == -1) - - for (const path of newPathEntries) { - core.addPath(path) - } - console.log('environment updated') } catch (error) { core.setFailed(error.message);