Skip to content

Update startFun.R #25

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

Open
mspandel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update startFun.R #25

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
9 changes: 5 additions & 4 deletions R/startFun.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ startFun <- function(input_path, cran_packages=NULL, bioc_packages=NULL, github_

message("Running Photon")

input_path <- normalizePath(input_path)
input_path <- normalizePath(input_path, winslash = "/")
electron_path <- normalizePath(
file.path(
input_path,
"electron-quick-start"
)
, winslash = "/"
)

#confirm versions greater than (node 8.4.0 and npm 5.3)
Expand Down Expand Up @@ -72,7 +73,7 @@ startFun <- function(input_path, cran_packages=NULL, bioc_packages=NULL, github_

if(.Platform$OS.type=="windows"){

r_portable_path <- normalizePath(file.path(electron_path, "R-Portable-Win", "bin"))
r_portable_path <- normalizePath(file.path(electron_path, "R-Portable-Win", "bin"), winslash = "/")

if(is.null(bioc_packages)){
bioc_packages <- "NULL"
Expand Down Expand Up @@ -106,7 +107,7 @@ startFun <- function(input_path, cran_packages=NULL, bioc_packages=NULL, github_



file.copy(normalizePath(file.path(input_app_dir, "app.R")),
file.copy(normalizePath(file.path(input_app_dir, "app.R"), winslash = "/"),
electron_win_dir,
overwrite=TRUE)

Expand All @@ -118,7 +119,7 @@ startFun <- function(input_path, cran_packages=NULL, bioc_packages=NULL, github_


} else if(.Platform$OS.type=="unix") {
r_portable_path <- normalizePath(file.path(input_path, "R-Portable-Mac"))
r_portable_path <- normalizePath(file.path(input_path, "R-Portable-Mac"), winslash = "/")


r_electron_version <- system(sprintf("cd %s; ./R CMD BATCH --version",
Expand Down