extend 'twodigitRversion' to handle more types

allow passing of `R_system_version` and `character` class objects to `twodigitRversion`
jamieo-ms · Nov 7, 2014 · 54e1ca0 · 54e1ca0
1 parent 6b4ae64
commit 54e1ca0
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/R/makeRepo.R b/R/makeRepo.R
@@ -74,12 +74,19 @@ repoPrefix <- function(type, Rversion){
 
 
 
-twodigitRversion <- function(R = R.version){
-  paste(R$major, strsplit(R$minor, ".", fixed = TRUE)[[1L]][1L], sep = ".")
+twodigitRversion <- function(R=R.version){
+  if("simple.list" %in% is(R)) {
+    paste(R$major, strsplit(R$minor, ".", fixed = TRUE)[[1L]][1L], sep = ".")
+  } else if ("R_system_version" %in% is(R)) {
+    paste(strsplit(as.character(R), ".", fixed=TRUE)[[1L]][1L:2L], collapse=".")
+  } else if (is.character(R)) {
+    paste(strsplit(R, ".", fixed=TRUE)[[1L]][1L:2L], collapse=".")
+  }
 }
 
 
 
+
 #' Deprecated function to download packages to local folder.
 #' 
 #' @inheritParams makeRepo