From 65fe6a82c70776c8d39cb6ec21b08db2c4a6fe24 Mon Sep 17 00:00:00 2001
From: Sergey Dolin <v-sedoli@microsoft.com>
Date: Mon, 21 Feb 2022 05:23:19 +0000
Subject: [PATCH] Use template literals instead of string concatenation
---
dist/setup/index.js | 9 ++++-----
src/setup-python.ts | 8 +++-----
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 054cb72..6a21eb3 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -6644,15 +6644,14 @@ function cacheDependencies(cache, pythonVersion) {
});
}
function run() {
+ var _a;
return __awaiter(this, void 0, void 0, function* () {
- if (process.env['AGENT_TOOLSDIRECTORY'] !== undefined) {
- core.debug('Python is expected to be installed into AGENT_TOOLSDIRECTORY=' +
- process.env['AGENT_TOOLSDIRECTORY']);
+ if ((_a = process.env.AGENT_TOOLSDIRECTORY) === null || _a === void 0 ? void 0 : _a.trim()) {
+ core.debug(`Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env['AGENT_TOOLSDIRECTORY']}`);
process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
}
else {
- core.debug('Python is expected to be installed into RUNNER_TOOL_CACHE=' +
- process.env['RUNNER_TOOL_CACHE']);
+ core.debug(`Python is expected to be installed into RUNNER_TOOL_CACHE==${process.env['RUNNER_TOOL_CACHE']}`);
}
try {
const version = core.getInput('python-version');
diff --git a/src/setup-python.ts b/src/setup-python.ts
index 6022b2e..ed2dd25 100644
--- a/src/setup-python.ts
+++ b/src/setup-python.ts
@@ -25,16 +25,14 @@ async function cacheDependencies(cache: string, pythonVersion: string) {
}
async function run() {
- if (process.env['AGENT_TOOLSDIRECTORY'] !== undefined) {
+ if (process.env.AGENT_TOOLSDIRECTORY?.trim()) {
core.debug(
- 'Python is expected to be installed into AGENT_TOOLSDIRECTORY=' +
- process.env['AGENT_TOOLSDIRECTORY']
+ `Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env['AGENT_TOOLSDIRECTORY']}`
);
process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
} else {
core.debug(
- 'Python is expected to be installed into RUNNER_TOOL_CACHE=' +
- process.env['RUNNER_TOOL_CACHE']
+ `Python is expected to be installed into RUNNER_TOOL_CACHE==${process.env['RUNNER_TOOL_CACHE']}`
);
}
try {