-
Notifications
You must be signed in to change notification settings - Fork 727
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
devel/RStudio: Fix bug that RStudio-server didn't have /usr/local/bin…
… in PATH This was previously fixed in post-install but the previous fix relied on the other path that changed, which eroded this fix. The new fix adds /usr/local/bin to PATH in the C++ code.
- Loading branch information
Showing
2 changed files
with
29 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
devel/RStudio/files/patch-src_cpp_session_modules_SessionGit.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
- add path %%PREFIX%%/bin to PATH so that gmake and cmake executable would be found | ||
|
||
--- src/cpp/session/modules/SessionGit.cpp.orig 2023-08-29 01:47:30 UTC | ||
+++ src/cpp/session/modules/SessionGit.cpp | ||
@@ -130,6 +130,9 @@ core::system::ProcessOptions procOptions() | ||
FilePath postbackDir = session::options().rpostbackPath().getParent(); | ||
core::system::addToPath(&childEnv, postbackDir.getAbsolutePath()); | ||
|
||
+ // add $PREFIX/bin to path | ||
+ core::system::addToPath(&childEnv, "%%PREFIX%%/bin"); | ||
+ | ||
options.workingDir = projects::projectContext().directory(); | ||
|
||
#ifdef _WIN32 | ||
@@ -3370,6 +3373,9 @@ core::Error initialize() | ||
} | ||
|
||
core::system::addToPath(postbackDir.getAbsolutePath()); | ||
+ | ||
+ // add $PREFIX/bin to path | ||
+ core::system::addToPath("%%PREFIX%%/bin"); | ||
|
||
// add suspend/resume handler | ||
addSuspendHandler(SuspendHandler(boost::bind(onSuspend, _2), onResume)); |