Added github branch installation (#302)

Azure · Sep 12, 2018 · 4020a93 · 4020a93
1 parent 1d26dd8
commit 4020a93
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/inst/startup/install_github.R b/inst/startup/install_github.R
@@ -6,7 +6,15 @@ jobPrepDirectory <- Sys.getenv("AZ_BATCH_JOB_PREP_WORKING_DIR")
 .libPaths(c(jobPrepDirectory, "/mnt/batch/tasks/shared/R/packages", .libPaths()))
 status <- tryCatch({
     for (package in args) {
-      packageDirectory <- strsplit(package, "/")[[1]]
+      packageVersion <- strsplit(package, "@")[[1]]
+
+      if (length(packageVersion) > 1) {
+        packageDirectory <- strsplit(packageVersion[1], "/")[[1]]
+      }
+      else {
+        packageDirectory <- strsplit(package, "/")[[1]]
+      }
+
       packageName <- packageDirectory[length(packageDirectory)]
 
       if (!require(packageName, character.only = TRUE)) {

diff --git a/inst/startup/worker.R b/inst/startup/worker.R
@@ -93,7 +93,15 @@ for (package in azbatchenv$packages) {
 }
 
 for (package in azbatchenv$github) {
-  packageDirectory <- strsplit(package, "/")[[1]]
+  packageVersion <- strsplit(package, "@")[[1]]
+
+  if (length(packageVersion) > 1) {
+    packageDirectory <- strsplit(packageVersion[1], "/")[[1]]
+  }
+  else {
+    packageDirectory <- strsplit(package, "/")[[1]]
+  }
+
   packageName <- packageDirectory[length(packageDirectory)]
 
   library(packageName, character.only = TRUE)