Merge pull request #36 from teimurjan/teimurjan/refactor-download-doctl

Refactor downloadDoctl function
digitalocean · Oct 6, 2020 · d36a87b · d36a87b
2 parents 329661d + 4be89da
commit d36a87b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -5311,22 +5311,16 @@ const fallbackVersion = "1.42.0"
 const octokit = new Octokit();
 
 async function downloadDoctl(version) {
-    var doctlInstall;
-
     if (process.platform === 'win32') {
         const doctlDownload = await tc.downloadTool(`${baseDownloadURL}/v${version}/doctl-${version}-windows-amd64.zip`);
-        doctlInstall = await tc.extractZip(doctlDownload);
+        return tc.extractZip(doctlDownload);
     }
-    else if (process.platform === 'darwin') {
+    if (process.platform === 'darwin') {
         const doctlDownload = await tc.downloadTool(`${baseDownloadURL}/v${version}/doctl-${version}-darwin-amd64.tar.gz`);
-        doctlInstall = await tc.extractTar(doctlDownload);
-    }
-    else {
-        const doctlDownload = await tc.downloadTool(`${baseDownloadURL}/v${version}/doctl-${version}-linux-amd64.tar.gz`);
-        doctlInstall = await tc.extractTar(doctlDownload);
+        return tc.extractTar(doctlDownload);
     }
-
-    return doctlInstall;
+    const doctlDownload = await tc.downloadTool(`${baseDownloadURL}/v${version}/doctl-${version}-linux-amd64.tar.gz`);
+    return tc.extractTar(doctlDownload);
 }
 
 async function run() {

diff --git a/main.js b/main.js
@@ -8,22 +8,16 @@ const fallbackVersion = "1.42.0"
 const octokit = new Octokit();
 
 async function downloadDoctl(version) {
-    var doctlInstall;
-
     if (process.platform === 'win32') {
         const doctlDownload = await tc.downloadTool(`${baseDownloadURL}/v${version}/doctl-${version}-windows-amd64.zip`);
-        doctlInstall = await tc.extractZip(doctlDownload);
+        return tc.extractZip(doctlDownload);
     }
-    else if (process.platform === 'darwin') {
+    if (process.platform === 'darwin') {
         const doctlDownload = await tc.downloadTool(`${baseDownloadURL}/v${version}/doctl-${version}-darwin-amd64.tar.gz`);
-        doctlInstall = await tc.extractTar(doctlDownload);
-    }
-    else {
-        const doctlDownload = await tc.downloadTool(`${baseDownloadURL}/v${version}/doctl-${version}-linux-amd64.tar.gz`);
-        doctlInstall = await tc.extractTar(doctlDownload);
+        return tc.extractTar(doctlDownload);
     }
-
-    return doctlInstall;
+    const doctlDownload = await tc.downloadTool(`${baseDownloadURL}/v${version}/doctl-${version}-linux-amd64.tar.gz`);
+    return tc.extractTar(doctlDownload);
 }
 
 async function run() {