Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
jlopez
RPACIB
Commits
e6c9e6cb
Commit
e6c9e6cb
authored
Apr 24, 2018
by
jlopez
Browse files
Fix R_VERSION
parent
9caf10fe
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/opt_home.R
View file @
e6c9e6cb
...
...
@@ -51,6 +51,13 @@ createHeader <- function() {
createEnv
<-
function
(
result
)
{
Rversion
=
"3.4.3"
if
(
input
$
rtemplate
==
"source2"
)
{
Rversion
=
"3.4.4"
}
else
if
(
input
$
rtemplate
==
"source3"
)
{
Rversion
=
"3.5.0"
}
if
(
input
$
containerType
==
"singularity"
)
{
result
<-
paste
(
result
,
"%environment"
,
sep
=
"\n"
)
...
...
@@ -62,7 +69,8 @@ createEnv <- function(result) {
result
<-
paste
(
result
,
"\tR_CONFIG_DIR=/etc/R/"
,
sep
=
"\n"
)
result
<-
paste
(
result
,
"\texport R_CONFIG_DIR"
,
sep
=
"\n"
)
}
else
{
result
<-
paste
(
result
,
"\tR_VERSION=3.4.3"
,
sep
=
"\n"
)
result
<-
paste0
(
result
,
"\n\tR_VERSION="
,
Rversion
)
result
<-
paste
(
result
,
"\texport R_VERSION"
,
sep
=
"\n"
)
result
<-
paste
(
result
,
"\tR_CONFIG_DIR=/etc/R/"
,
sep
=
"\n"
)
result
<-
paste
(
result
,
"\texport R_CONFIG_DIR"
,
sep
=
"\n"
)
...
...
@@ -76,7 +84,7 @@ createEnv <- function(result) {
if
(
input
$
rtemplate
==
"none"
)
{
}
else
if
(
input
$
rtemplate
==
"base"
)
{
result
<-
paste
(
result
,
"ENV R_VERSION=
3.4.3"
,
sep
=
"\n"
)
result
<-
paste
0
(
result
,
"ENV R_VERSION=
"
,
Rversion
)
result
<-
paste
(
result
,
"RUN export R_VERSION"
,
sep
=
"\n"
)
result
<-
paste
(
result
,
"ENV R_CONFIG_DIR=/etc/R/"
,
sep
=
"\n"
)
result
<-
paste
(
result
,
"RUN export R_CONFIG_DIR"
,
sep
=
"\n"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment