Clean up changes

__tests__/installer.test.ts

@@ -1,26 +1,18 @@
 import installer = require('../src/installer');
 import io = require('@actions/io');
-import fs = require('fs')
+import fs = require('fs');
-import os = require('os')
+import os = require('os');
 import path = require('path');
 
-const toolDir = path.join(
+const toolDir = path.join(__dirname, 'runner', 'tools');
-    __dirname,
-    'runner',
-    'tools'
-  );
 
-const tempDir = path.join(
+const tempDir = path.join(__dirname, 'runner', 'temp');
-    __dirname,
-    'runner',
-    'temp'
-  );
 
 describe('installer tests', () => {
   beforeAll(() => {});
   beforeAll(async () => {
     // TODO - these should eventually be changed to match new method of loading dir
-    process.env['Runner.ToolsDirectory'] = toolDir
+    process.env['Runner.ToolsDirectory'] = toolDir;
     process.env['Runner.TempDirectory'] = tempDir;
     await io.rmRF(toolDir);
     await io.rmRF(tempDir);
@@ -38,7 +30,7 @@ describe('installer tests', () => {
     it('Falls back to backup location if first one doesnt contain correct version', async () => {
       await installer.getNode('5.10.1');
       const nodeDir = path.join(toolDir, 'node', '5.10.1', os.arch());
-      
+
       expect(fs.existsSync(`${nodeDir}.complete`)).toBe(true);
       expect(fs.existsSync(path.join(nodeDir, 'node.exe'))).toBe(true);
     }, 100000);
@@ -46,7 +38,7 @@ describe('installer tests', () => {
     it('Falls back to third location if second one doesnt contain correct version', async () => {
       await installer.getNode('0.12.18');
       const nodeDir = path.join(toolDir, 'node', '0.12.18', os.arch());
-      
+
       expect(fs.existsSync(`${nodeDir}.complete`)).toBe(true);
       expect(fs.existsSync(path.join(nodeDir, 'node.exe'))).toBe(true);
     }, 100000);
@@ -71,11 +63,7 @@ describe('installer tests', () => {
   }, 100000);
 
   it('Uses version of node installed in cache', async () => {
-    const nodeDir: string = path.join(
+    const nodeDir: string = path.join(toolDir, '250.0.0', os.arch());
-      toolDir,
-      '250.0.0',
-      os.arch()
-    );
     await io.mkdirP(nodeDir);
     fs.writeFileSync(`${nodeDir}.complete`, 'hello');
     // This will throw if it doesn't find it in the cache (because no such version exists)
@@ -84,15 +72,10 @@ describe('installer tests', () => {
   });
 
   it('Doesnt use version of node that was only partially installed in cache', async () => {
-    const nodeDir: string = path.join(
+    const nodeDir: string = path.join(toolDir, '250.0.0', os.arch());
-      toolDir,
-      '250.0.0',
-      os.arch()
-    );
     await io.mkdirP(nodeDir);
     let thrown = false;
     try {
-        
       // This will throw if it doesn't find it in the cache (because no such version exists)
       await installer.getNode('251.0.0');
     } catch {
@@ -103,11 +86,7 @@ describe('installer tests', () => {
   });
 
   it('Resolves semantic versions of node installed in cache', async () => {
-    const nodeDir: string = path.join(
+    const nodeDir: string = path.join(toolDir, '250.0.0', os.arch());
-      toolDir,
-      '250.0.0',
-      os.arch()
-    );
     await io.mkdirP(nodeDir);
     fs.writeFileSync(`${nodeDir}.complete`, 'hello');
     // These will throw if it doesn't find it in the cache (because no such version exists)

lib/installer.js

@@ -143,9 +143,6 @@ function acquireNode(version) {
             if (err['httpStatusCode'] && err['httpStatusCode'] === '404') {
                 return yield acquireNodeFromFallbackLocation(version);
             }
-            else {
-                console.log('Message', err.message.statusCode);
-            }
             throw err;
         }
         //
@@ -153,6 +150,7 @@ function acquireNode(version) {
         //
         let extPath;
         if (osPlat == 'win32') {
+            let _7zPath = path.join(__dirname, '7zr.exe');
             extPath = yield tc.extract7z(downloadPath);
         }
         else {

src/installer.ts

@@ -147,8 +147,6 @@ async function acquireNode(version: string): Promise<string> {
   } catch (err) {
     if (err['httpStatusCode'] && err['httpStatusCode'] === '404') {
       return await acquireNodeFromFallbackLocation(version);
-    } else {
-      console.log('Message', err.message.statusCode);
     }
 
     throw err;
@@ -159,6 +157,7 @@ async function acquireNode(version: string): Promise<string> {
   //
   let extPath: string;
   if (osPlat == 'win32') {
+    let _7zPath = path.join(__dirname, '7zr.exe');
     extPath = await tc.extract7z(downloadPath);
   } else {
     extPath = await tc.extractTar(downloadPath);