Tweak to R exe path on macos

jamovi · Feb 10, 2024 · e5c3cea · e5c3cea
1 parent 1a9f741
commit e5c3cea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/compilerr.js b/compilerr.js
@@ -335,9 +335,7 @@ const compile = function(srcDir, moduleDir, paths, packageInfo, log, options) {
     log.debug('appended');
 
     try {
-        if (process.platform === 'darwin')
-            cmd = util.format('"%s" "--library=%s" --no-help --no-demo --no-html --no-docs --no-multiarch "%s"', path.join(paths.rHome, 'bin', 'INSTALL'), buildDir, tempPath);
-        else if (paths.rHome)
+        if (paths.rHome)
             cmd = util.format('"%s" CMD INSTALL "--library=%s" --no-help --no-demo --no-html --no-docs --no-multiarch "%s"', paths.rExe, buildDir, tempPath);
         else
             cmd = util.format('R CMD INSTALL "--library=%s" --no-help --no-demo --no-html --no-docs --no-multiarch "%s"', buildDir, tempPath);

diff --git a/index.js b/index.js
@@ -172,7 +172,7 @@ try {
         let bin  = path.dirname(exe);
         let home = path.dirname(bin);
         let rHome = path.join(home, 'Frameworks', 'R.framework', 'Versions', 'Current', 'Resources');
-        let rExe  = path.join(bin, 'R');
+        const rExe = path.join(rHome, 'bin', 'R');
         let rLibs = `${ path.join(home, 'Resources', 'modules', 'base', 'R')}`;
         paths = { home, rHome, rExe, rLibs };
         platName = 'macos';