From 0fd2a57c654ebaa6d3fc2f3b11761b51bb5db470 Mon Sep 17 00:00:00 2001
From: peaceiris <30958501+peaceiris@users.noreply.github.com>
Date: Fri, 3 Jan 2020 07:55:52 +0000
Subject: [PATCH 1/2] refactor: Remove extra try-catch

---
 src/installer.ts | 64 +++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/src/installer.ts b/src/installer.ts
index 1857009..257aaf8 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -17,42 +17,38 @@ if (!tempDir) {
 }
 
 export default async function installer(version: string) {
-  try {
-    const osName: string = getOS(process.platform);
-    console.log(`Operating System: ${osName}`);
+  const osName: string = getOS(process.platform);
+  console.log(`Operating System: ${osName}`);
 
-    const mdbookURL: string = getURL(osName, version);
-    core.debug(`mdbookURL: ${mdbookURL}`);
+  const mdbookURL: string = getURL(osName, version);
+  core.debug(`mdbookURL: ${mdbookURL}`);
 
-    let baseLocation: string;
-    if (process.platform === 'win32') {
-      baseLocation = process.env['USERPROFILE'] || 'C:\\';
-    } else {
-      baseLocation = `${process.env.HOME}`;
-    }
-    const mdbookPath: string = path.join(baseLocation, 'mdbookbin');
-    await io.mkdirP(mdbookPath);
-    core.addPath(mdbookPath);
+  let baseLocation: string;
+  if (process.platform === 'win32') {
+    baseLocation = process.env['USERPROFILE'] || 'C:\\';
+  } else {
+    baseLocation = `${process.env.HOME}`;
+  }
+  const mdbookPath: string = path.join(baseLocation, 'mdbookbin');
+  await io.mkdirP(mdbookPath);
+  core.addPath(mdbookPath);
 
-    // Download and extract mdbook binary
-    await io.mkdirP(tempDir);
-    const mdbookAssets: string = await tc.downloadTool(mdbookURL);
-    let mdbookBin: string = '';
-    if (osName === 'pc-windows-msvc') {
-      const mdbookExtractedFolder: string = await tc.extractZip(
-        mdbookAssets,
-        tempDir
-      );
-      mdbookBin = `${mdbookExtractedFolder}/mdbook.exe`;
-    } else {
-      const mdbookExtractedFolder: string = await tc.extractTar(
-        mdbookAssets,
-        tempDir
-      );
-      mdbookBin = `${mdbookExtractedFolder}/mdbook`;
-    }
-    await io.mv(mdbookBin, mdbookPath);
-  } catch (error) {
-    core.setFailed(error.message);
+  // Download and extract mdbook binary
+  await io.mkdirP(tempDir);
+  const mdbookAssets: string = await tc.downloadTool(mdbookURL);
+  let mdbookBin: string = '';
+  if (osName === 'pc-windows-msvc') {
+    const mdbookExtractedFolder: string = await tc.extractZip(
+      mdbookAssets,
+      tempDir
+    );
+    mdbookBin = `${mdbookExtractedFolder}/mdbook.exe`;
+  } else {
+    const mdbookExtractedFolder: string = await tc.extractTar(
+      mdbookAssets,
+      tempDir
+    );
+    mdbookBin = `${mdbookExtractedFolder}/mdbook`;
   }
+  await io.mv(mdbookBin, mdbookPath);
 }

From 5a3ee10db2dafa760622a088c89e1ccfe4bffe65 Mon Sep 17 00:00:00 2001
From: peaceiris <30958501+peaceiris@users.noreply.github.com>
Date: Fri, 3 Jan 2020 07:59:48 +0000
Subject: [PATCH 2/2] refactor: Rename mdbook to tool

---
 src/installer.ts | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/installer.ts b/src/installer.ts
index 257aaf8..fbc0974 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -20,8 +20,8 @@ export default async function installer(version: string) {
   const osName: string = getOS(process.platform);
   console.log(`Operating System: ${osName}`);
 
-  const mdbookURL: string = getURL(osName, version);
-  core.debug(`mdbookURL: ${mdbookURL}`);
+  const toolURL: string = getURL(osName, version);
+  core.debug(`toolURL: ${toolURL}`);
 
   let baseLocation: string;
   if (process.platform === 'win32') {
@@ -29,26 +29,26 @@ export default async function installer(version: string) {
   } else {
     baseLocation = `${process.env.HOME}`;
   }
-  const mdbookPath: string = path.join(baseLocation, 'mdbookbin');
-  await io.mkdirP(mdbookPath);
-  core.addPath(mdbookPath);
+  const toolPath: string = path.join(baseLocation, 'toolbin');
+  await io.mkdirP(toolPath);
+  core.addPath(toolPath);
 
   // Download and extract mdbook binary
   await io.mkdirP(tempDir);
-  const mdbookAssets: string = await tc.downloadTool(mdbookURL);
-  let mdbookBin: string = '';
+  const toolAssets: string = await tc.downloadTool(toolURL);
+  let toolBin: string = '';
   if (osName === 'pc-windows-msvc') {
-    const mdbookExtractedFolder: string = await tc.extractZip(
-      mdbookAssets,
+    const toolExtractedFolder: string = await tc.extractZip(
+      toolAssets,
       tempDir
     );
-    mdbookBin = `${mdbookExtractedFolder}/mdbook.exe`;
+    toolBin = `${toolExtractedFolder}/mdbook.exe`;
   } else {
-    const mdbookExtractedFolder: string = await tc.extractTar(
-      mdbookAssets,
+    const toolExtractedFolder: string = await tc.extractTar(
+      toolAssets,
       tempDir
     );
-    mdbookBin = `${mdbookExtractedFolder}/mdbook`;
+    toolBin = `${toolExtractedFolder}/mdbook`;
   }
-  await io.mv(mdbookBin, mdbookPath);
+  await io.mv(toolBin, toolPath);
 }