From 4890b7e3010f7103e2977e781fc5426fbcd436cd Mon Sep 17 00:00:00 2001
From: jlopez <jimmy.lopez0023@gmail.com>
Date: Wed, 15 May 2019 16:18:20 +0200
Subject: [PATCH] Add R 3.6.0
---
pages/pages_def_home.R | 2 +-
server/opt_home.R | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/pages/pages_def_home.R b/pages/pages_def_home.R
index 266135f..ab50d92 100755
--- a/pages/pages_def_home.R
+++ b/pages/pages_def_home.R
@@ -40,7 +40,7 @@ tabHome = fluidPage(align="left",
radioButtons("containerType", "Container type:", choices = list("Singularity" = "singularity", "Docker" = "docker"), selected = "singularity"),
br(),
#selectizeInput('rcranpackagelist', 'R CRAN:', choices = NULL, multiple=TRUE, options = list(maxItems = 30000)),
- selectizeInput('rtemplate', 'R origin:', choices = c(`None` = 'none', `R from source 3.4.3` = 'source', `R from source 3.4.4` = 'source2', `R from source 3.5.0` = 'source3', `R from r-base` = 'base', `R from CRAN depo` = 'cran'), selected = "none", multiple = FALSE),
+ selectizeInput('rtemplate', 'R origin:', choices = c(`None` = 'none', `R from source 3.4.3` = 'source', `R from source 3.4.4` = 'source2', `R from source 3.5.0` = 'source3', `R from source 3.6.0` = 'source4', `R from r-base` = 'base', `R from CRAN depo` = 'cran'), selected = "none", multiple = FALSE),
#selectizeInput('biocontainers', 'BioContainers tools :', choices = getBioconductorPackage(), multiple = TRUE),
diff --git a/server/opt_home.R b/server/opt_home.R
index 4abdf40..d2df469 100755
--- a/server/opt_home.R
+++ b/server/opt_home.R
@@ -70,6 +70,9 @@ createEnv <- function(result) {
}else if(input$rtemplate == "source3") {
Rversion = "3.5.0"
}
+ }else if(input$rtemplate == "source4") {
+ Rversion = "3.6.0"
+ }
if(input$containerType == "singularity") {
result <- paste(result, "%environment", sep = "\n")
@@ -720,6 +723,8 @@ createContentFile <- function() {
Rversion = "3.4.4"
}else if(input$rtemplate == "source3") {
Rversion = "3.5.0"
+ } else if(input$rtemplate == "source4") {
+ Rversion = "3.6.0"
}
result <- createRSource(result, Rversion)
--
GitLab