Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

only set TZDIR on Windows and MacOS #5333

Merged
merged 1 commit into from
Nov 29, 2023
Merged

only set TZDIR on Windows and MacOS #5333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Desktop/utilities/processhelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ QProcessEnvironment ProcessHelper::getProcessEnvironmentForJaspEngine()
env.insert("R_PROFILE", "something-which-doesn't-exist");
env.insert("R_PROFILE_USER", "something-which-doesn't-exist");
env.insert("R_ENVIRON_USER", "something-which-doesn't-exist");
env.insert("TZDIR", TZDIR);

//Lets set LC_ALL to utf8 before the process starts.
//env.insert("LC_ALL", ".UTF8");
Expand All @@ -81,14 +82,14 @@ QProcessEnvironment ProcessHelper::getProcessEnvironmentForJaspEngine()
//env.insert("R_ENVIRON_USER", "something-which-doesnt-exist");

env.insert("LC_CTYPE", "UTF-8"); //This isn't really a locale but seems necessary to get proper output from gettext on mac
env.insert("TZDIR", TZDIR);

#else // linux
env.insert("LD_LIBRARY_PATH", rHome.absoluteFilePath("lib") + ":" + rHome.absoluteFilePath("library/RInside/lib") + ":" + rHome.absoluteFilePath("library/Rcpp/lib") + ":" + rHome.absoluteFilePath("site-library/RInside/lib") + ":" + rHome.absoluteFilePath("site-library/Rcpp/lib") + ":/app/lib/:/app/lib64/");
env.insert("R_HOME", rHome.absolutePath());
env.insert("R_LIBS", programDir.absoluteFilePath("R/library") + custom_R_library + ":" + rHome.absoluteFilePath("library") + ":" + rHome.absoluteFilePath("site-library"));
#endif

env.insert("TZDIR", TZDIR);
env.insert("R_LIBS_SITE", "");
env.insert("R_LIBS_USER", AppDirs::userRLibrary().toStdString().c_str());

Expand Down
Loading