From 41539df7fe56a422b2676b16fb9489ef8618b14b Mon Sep 17 00:00:00 2001
From: Sascha Mann <git@mail.saschamann.eu>
Date: Sun, 24 Nov 2019 20:55:46 +0100
Subject: [PATCH] Fix linux install script

---
 lib/installer.js | 6 ++++--
 src/installer.ts | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/installer.js b/lib/installer.js
index b74fbed..f569500 100644
--- a/lib/installer.js
+++ b/lib/installer.js
@@ -113,8 +113,10 @@ function installJulia(version, arch) {
         // Install it
         switch (osPlat) {
             case 'linux':
-                const juliaExtractedFolder = yield tc.extractTar(juliaDownloadPath);
-                return path.join(juliaExtractedFolder, `julia-${version}`);
+                // tc.extractTar doesn't support stripping components, so we have to call tar manually
+                yield exec.exec('mkdir', [`${process.env.HOME}/julia`]);
+                yield exec.exec('tar', ['xf', juliaDownloadPath, '--strip-components=1', '-C', `${process.env.HOME}/julia`]);
+                return `${process.env.HOME}/julia`;
             case 'win32':
                 const juliaInstallationPath = path.join('C:', 'Julia');
                 yield exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/S /D=${juliaInstallationPath}" -NoNewWindow -Wait`]);
diff --git a/src/installer.ts b/src/installer.ts
index afe6e33..5b04335 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -106,8 +106,10 @@ export async function installJulia(version: string, arch: string): Promise<strin
     // Install it
     switch (osPlat) {
         case 'linux':
-            const juliaExtractedFolder = await tc.extractTar(juliaDownloadPath)
-            return path.join(juliaExtractedFolder, `julia-${version}`)
+            // tc.extractTar doesn't support stripping components, so we have to call tar manually
+            await exec.exec('mkdir', [`${process.env.HOME}/julia`])
+            await exec.exec('tar', ['xf', juliaDownloadPath, '--strip-components=1', '-C', `${process.env.HOME}/julia`])
+            return `${process.env.HOME}/julia`
         case 'win32':
             const juliaInstallationPath = path.join('C:', 'Julia')
             await exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/S /D=${juliaInstallationPath}" -NoNewWindow -Wait`])