Need to explicitly check for true values rather than relying on coercion

I misremembered how type coercion works with boolean strings in typescript
r-lib · Jan 13, 2021 · 30e0be0 · 30e0be0
1 parent 1efbdeb
commit 30e0be0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/setup-r/lib/installer.js b/setup-r/lib/installer.js
@@ -106,7 +106,7 @@ function acquireR(version, rtoolsVersion) {
                     acquireUtilsMacOS(),
                     acquireRMacOS(version)
                 ]);
-                if (core.getInput("remove-openmp-macos")) {
+                if (core.getInput("remove-openmp-macos") === "true") {
                     yield removeOpenmpFlags();
                 }
             }
@@ -330,13 +330,13 @@ function acquireRtools(version) {
         }
         if (rtools4) {
             core.addPath(`C:\\rtools40\\usr\\bin`);
-            if (core.getInput("windows-path-include-mingw")) {
+            if (core.getInput("windows-path-include-mingw") === "true") {
                 core.addPath(`C:\\rtools40\\mingw64\\bin`);
             }
         }
         else {
             core.addPath(`C:\\Rtools\\bin`);
-            if (core.getInput("windows-path-include-mingw")) {
+            if (core.getInput("windows-path-include-mingw") === "true") {
                 core.addPath(`C:\\Rtools\\mingw_64\\bin`);
             }
         }
@@ -365,8 +365,8 @@ function setupRLibrary() {
         core.debug("R profile is at " + profilePath);
         let rspm = process.env["RSPM"] ? `'${process.env["RSPM"]}'` : "NULL";
         let cran = `'${process.env["CRAN"] || "https://cloud.r-project.org"}'`;
-        let user_agent = core.getInput("http-user-agent") == "default" ||
-            core.getInput("http-user-agent") == ""
+        let user_agent = core.getInput("http-user-agent") === "default" ||
+            core.getInput("http-user-agent") === ""
             ? 'sprintf("R/%s R (%s) on GitHub Actions", getRversion(), paste(getRversion(), R.version$platform, R.version$arch, R.version$os))'
             : `"${core.getInput("http-user-agent")}"`;
         yield fs.promises.writeFile(profilePath, `options(\

diff --git a/setup-r/src/installer.ts b/setup-r/src/installer.ts
@@ -74,7 +74,7 @@ async function acquireR(version: string, rtoolsVersion: string) {
         acquireUtilsMacOS(),
         acquireRMacOS(version)
       ]);
-      if (core.getInput("remove-openmp-macos")) {
+      if (core.getInput("remove-openmp-macos") === "true") {
         await removeOpenmpFlags();
       }
     } else {
@@ -319,12 +319,12 @@ async function acquireRtools(version: string) {
   }
   if (rtools4) {
     core.addPath(`C:\\rtools40\\usr\\bin`);
-    if (core.getInput("windows-path-include-mingw")) {
+    if (core.getInput("windows-path-include-mingw") === "true") {
       core.addPath(`C:\\rtools40\\mingw64\\bin`);
     }
   } else {
     core.addPath(`C:\\Rtools\\bin`);
-    if (core.getInput("windows-path-include-mingw")) {
+    if (core.getInput("windows-path-include-mingw") === "true") {
       core.addPath(`C:\\Rtools\\mingw_64\\bin`);
     }
   }
@@ -356,8 +356,8 @@ async function setupRLibrary() {
   let rspm = process.env["RSPM"] ? `'${process.env["RSPM"]}'` : "NULL";
   let cran = `'${process.env["CRAN"] || "https://cloud.r-project.org"}'`;
   let user_agent =
-    core.getInput("http-user-agent") == "default" ||
-    core.getInput("http-user-agent") == ""
+    core.getInput("http-user-agent") === "default" ||
+    core.getInput("http-user-agent") === ""
       ? 'sprintf("R/%s R (%s) on GitHub Actions", getRversion(), paste(getRversion(), R.version$platform, R.version$arch, R.version$os))'
       : `"${core.getInput("http-user-agent")}"`;