File 0011-R_Slave-R_NoEcho-for-non-Windows.patch of Package rstudio

Overview Repositories Revisions Requests Users Attributes Meta

File 0011-R_Slave-R_NoEcho-for-non-Windows.patch of Package rstudio

From 226b0a0191245f0d63132c85f1a94ad9ad4ef4aa Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinushey@gmail.com>
Date: Wed, 1 Apr 2020 10:43:13 -0700
Subject: [PATCH 11/11] R_Slave -> R_NoEcho for non-Windows

(cherry picked from commit 3fb2397c2f208bb8ace0bbaf269481ccb96b5b20)
---
 src/cpp/r/session/REmbeddedPosix.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/cpp/r/session/REmbeddedPosix.cpp b/src/cpp/r/session/REmbeddedPosix.cpp
index 6518330db6..851ddbb011 100644
--- a/src/cpp/r/session/REmbeddedPosix.cpp
+++ b/src/cpp/r/session/REmbeddedPosix.cpp
@@ -13,6 +13,8 @@
  *
  */
 
+#include <Rversion.h>
+
 #include <r/RExec.hpp>
 
 #include <core/FilePath.hpp>
@@ -104,7 +106,11 @@ void runEmbeddedR(const core::FilePath& /*rHome*/,    // ignored on posix
    structRstart rp;
    Rstart Rp = &rp;
    R_DefParams(Rp) ;
-   Rp->R_Slave = FALSE ;
+#if R_VERSION < R_Version(4, 0, 0)
+   Rp->R_Slave = FALSE;
+#else
+   Rp->R_NoEcho = FALSE;
+#endif
    Rp->R_Quiet = quiet ? TRUE : FALSE;
    Rp->R_Interactive = TRUE ;
    Rp->SaveAction = defaultSaveAction ;
-- 
2.26.2

Places

File 0011-R_Slave-R_NoEcho-for-non-Windows.patch of Package rstudio

Places