Use template literals instead of string concatenation

actions · Feb 21, 2022 · 65fe6a8 · 65fe6a8
1 parent 011c443
commit 65fe6a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git 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
@@ -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 {