From 56e107761d526aca16d4c6f267ec197ee8b1142c Mon Sep 17 00:00:00 2001
From: Ian Butterworth <i.r.butterworth@gmail.com>
Date: Tue, 21 Nov 2023 10:35:55 -0500
Subject: [PATCH] Use .tar.gz files where available for faster win install
 (#171)

---
 lib/installer.js | 20 +++++++++++++-------
 src/installer.ts | 19 ++++++++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/lib/installer.js b/lib/installer.js
index 3964a189..47f62784 100644
--- a/lib/installer.js
+++ b/lib/installer.js
@@ -126,9 +126,9 @@ function getDesiredFileExts() {
     let hasFileExt2;
     let fileExt2;
     if (osPlat == 'win32') {
-        fileExt1 = 'exe';
-        hasFileExt2 = false;
-        fileExt2 = '';
+        fileExt1 = 'tar.gz';
+        hasFileExt2 = true;
+        fileExt2 = 'exe';
     }
     else if (osPlat == 'darwin') {
         fileExt1 = 'tar.gz';
@@ -251,12 +251,18 @@ function installJulia(versionInfo, version, arch) {
                 yield exec.exec('tar', ['xf', juliaDownloadPath, '--strip-components=1', '-C', tempInstallDir]);
                 return tempInstallDir;
             case 'win32':
-                if (version.endsWith('nightly') || semver.gtr(version, '1.3', { includePrerelease: true })) {
-                    // The installer changed in 1.4: https://github.com/JuliaLang/julia/blob/ef0c9108b12f3ae177c51037934351ffa703b0b5/NEWS.md#build-system-changes
-                    yield exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/SILENT /dir=${path.join(process.cwd(), tempInstallDir)}" -NoNewWindow -Wait`]);
+                if (fileInfo !== null && fileInfo.extension == 'exe') {
+                    if (version.endsWith('nightly') || semver.gtr(version, '1.3', { includePrerelease: true })) {
+                        // The installer changed in 1.4: https://github.com/JuliaLang/julia/blob/ef0c9108b12f3ae177c51037934351ffa703b0b5/NEWS.md#build-system-changes
+                        yield exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/SILENT /dir=${path.join(process.cwd(), tempInstallDir)}" -NoNewWindow -Wait`]);
+                    }
+                    else {
+                        yield exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/S /D=${path.join(process.cwd(), tempInstallDir)}" -NoNewWindow -Wait`]);
+                    }
                 }
                 else {
-                    yield exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/S /D=${path.join(process.cwd(), tempInstallDir)}" -NoNewWindow -Wait`]);
+                    // This is the more common path. Using .tar.gz is much faster
+                    yield exec.exec('powershell', ['-Command', `tar xf ${juliaDownloadPath} --strip-components=1 -C ${tempInstallDir}`]);
                 }
                 return tempInstallDir;
             case 'darwin':
diff --git a/src/installer.ts b/src/installer.ts
index d19eac93..83756d51 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -100,9 +100,9 @@ function getDesiredFileExts(): [string, boolean, string] {
     let fileExt2: string
 
     if (osPlat == 'win32') {
-        fileExt1 = 'exe'
-        hasFileExt2 = false
-        fileExt2 = ''
+        fileExt1 = 'tar.gz'
+        hasFileExt2 = true
+        fileExt2 = 'exe'
     } else if (osPlat == 'darwin') {
         fileExt1 = 'tar.gz'
         hasFileExt2 = true
@@ -235,11 +235,16 @@ export async function installJulia(versionInfo, version: string, arch: string):
             await exec.exec('tar', ['xf', juliaDownloadPath, '--strip-components=1', '-C', tempInstallDir])
             return tempInstallDir
         case 'win32':
-            if (version.endsWith('nightly') || semver.gtr(version, '1.3', {includePrerelease: true})) {
-                // The installer changed in 1.4: https://github.com/JuliaLang/julia/blob/ef0c9108b12f3ae177c51037934351ffa703b0b5/NEWS.md#build-system-changes
-                await exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/SILENT /dir=${path.join(process.cwd(), tempInstallDir)}" -NoNewWindow -Wait`])
+            if (fileInfo !== null && fileInfo.extension == 'exe') {
+                if (version.endsWith('nightly') || semver.gtr(version, '1.3', {includePrerelease: true})) {
+                    // The installer changed in 1.4: https://github.com/JuliaLang/julia/blob/ef0c9108b12f3ae177c51037934351ffa703b0b5/NEWS.md#build-system-changes
+                    await exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/SILENT /dir=${path.join(process.cwd(), tempInstallDir)}" -NoNewWindow -Wait`])
+                } else {
+                    await exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/S /D=${path.join(process.cwd(), tempInstallDir)}" -NoNewWindow -Wait`])
+                }
             } else {
-                await exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/S /D=${path.join(process.cwd(), tempInstallDir)}" -NoNewWindow -Wait`])
+                // This is the more common path. Using .tar.gz is much faster
+                await exec.exec('powershell', ['-Command', `tar xf ${juliaDownloadPath} --strip-components=1 -C ${tempInstallDir}`])
             }
             return tempInstallDir
         case 'darwin':