setup-r fix for rtools version selection

gaborcsardi · gaborcsardi · commit 8b4732ba46c3 · 2023-01-09T15:43:25.000+01:00
[ci skip]
diff --git a/setup-r/lib/installer.js b/setup-r/lib/installer.js
@@ -404,7 +404,7 @@ function acquireRtools(version, rversion) {
         const rtools43 = versionNumber >= 42;
         const rtools42 = !rtools43 && versionNumber >= 41;
         const rtools40 = !rtools42 && versionNumber >= 40;
-        const rtools3x = !rtools42 && !rtools40;
+        const rtools3x = !rtools43 && !rtools42 && !rtools40;
         var downloadUrl, fileName;
         if (rtools3x) {
             fileName = util.format("Rtools%s.exe", version);
diff --git a/setup-r/src/installer.ts b/setup-r/src/installer.ts
@@ -382,7 +382,7 @@ async function acquireRtools(version: string, rversion: string) {
   const rtools43 = versionNumber >= 42;
   const rtools42 = !rtools43 && versionNumber >= 41;
   const rtools40 = !rtools42 && versionNumber >= 40;
-  const rtools3x = !rtools42 && !rtools40;
+  const rtools3x = !rtools43 && !rtools42 && !rtools40;
   var downloadUrl, fileName;
   if (rtools3x) {
     fileName = util.format("Rtools%s.exe", version);
