Skip to content

Fix for Mac path issue, completed message, done button #33

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
adrianco wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix for Mac path issue, completed message, done button #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f44ba81
fixed Mac install to use electron path
adrianco Dec 27, 2020
19b58ba
Added Done button
adrianco Dec 28, 2020
7e871fa
Update photon_rstudioaddin.R
adrianco Dec 28, 2020
0c9a4ae
Update photon_rstudioaddin.R
adrianco Dec 28, 2020
871b8a2
Update photon_rstudioaddin.R
adrianco Dec 28, 2020
1367ae5
Added finished message
adrianco Dec 28, 2020
3f4cda0
Enabled Done button
adrianco Dec 28, 2020
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
2 changes: 1 addition & 1 deletion R/photon_rstudioaddin.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ photon_rstudioaddin <- function(RscriptRepository = NULL) {
# Shiny fileinput resethandler

miniUI::gadgetTitleBar("Use Photon to Build Standalone Shiny Apps",
left = NULL, right = NULL),
left = NULL),

miniUI::miniTabstripPanel(
#miniUI::miniTabPanel(
Expand Down
3 changes: 2 additions & 1 deletion R/startFun.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,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(electron_path, "R-Portable-Mac"))


r_electron_version <- system(sprintf("cd %s; ./R CMD BATCH --version",
Expand Down Expand Up @@ -160,6 +160,7 @@ startFun <- function(input_path, cran_packages=NULL, bioc_packages=NULL, github_
system(sprintf("cd %s; npm install; npm run package-mac",
r_portable_path))
}
message("Photon finished")
}