Merge branch 'main' into remove_file

This commit is contained in:
Nick Fyson 2020-09-15 15:16:05 +01:00 committed by GitHub
commit 0da3e94867
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions

2
lib/runner.js generated
View file

@ -158,7 +158,7 @@ program
const shEnvFile = path.join(config.tempDir, "codeql-env.sh");
const shEnvFileContents = Object.entries(tracerConfig.env)
// Some vars contain ${LIB} that we do not want to be expanded when executing this script
.map(([key, value]) => `export ${key}="${value.replace("$", "\\$")}"`)
.map(([key, value]) => `export ${key}="${value.replace(/\$/g, "\\$")}"`)
.join("\n");
fs.writeFileSync(shEnvFile, shEnvFileContents);
logger.info(`\nCodeQL environment output to "${jsonEnvFile}" and "${shEnvFile}". ` +

File diff suppressed because one or more lines are too long

View file

@ -231,7 +231,9 @@ program
const shEnvFile = path.join(config.tempDir, "codeql-env.sh");
const shEnvFileContents = Object.entries(tracerConfig.env)
// Some vars contain ${LIB} that we do not want to be expanded when executing this script
.map(([key, value]) => `export ${key}="${value.replace("$", "\\$")}"`)
.map(
([key, value]) => `export ${key}="${value.replace(/\$/g, "\\$")}"`
)
.join("\n");
fs.writeFileSync(shEnvFile, shEnvFileContents);