From 048d5dbc4b9b491f8e80262bf54c00ba94759753 Mon Sep 17 00:00:00 2001
From: chasemc <cclark42@uic.edu>
Date: Mon, 27 Apr 2020 12:01:34 -0500
Subject: [PATCH 1/2] Add mac_url argument

---
 DESCRIPTION       | 2 +-
 R/meta_function.R | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 9cc74228..265d6871 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -21,7 +21,7 @@ Imports:
     stringr,
     withr,
     openssl
-RoxygenNote: 6.1.1
+RoxygenNote: 7.1.0
 Suggests: 
     testthat (>= 2.1.0),
     covr,
diff --git a/R/meta_function.R b/R/meta_function.R
index 02db3331..e0f109e6 100644
--- a/R/meta_function.R
+++ b/R/meta_function.R
@@ -24,6 +24,7 @@
 #' @param nodejs_path path to nodejs
 #' @param nodejs_version nodejs version to install
 #' @param permission automatically grant permission to install nodejs and R 
+#' @param mac_url url to mac OS tar.gz 
 #'
 #' @export
 #'
@@ -42,7 +43,8 @@ electrify <- function(app_name = NULL,
                       run_build = TRUE,
                       nodejs_path = file.path(system.file(package = "electricShine"), "nodejs"),
                       nodejs_version = "v10.16.0",
-                      permission = FALSE){
+                      permission = FALSE,
+                      mac_url = "https://mac.r-project.org/el-capitan/R-3.6-branch/R-3.6-branch-el-capitan-sa-x86_64.tar.gz"){
   
   
   
@@ -123,7 +125,7 @@ electrify <- function(app_name = NULL,
   # Download and Install R --------------------------------------------------
   electricShine::install_r(cran_like_url = cran_like_url,
                            app_root_path = app_root_path,
-                           mac_url = "https://mac.r-project.org/el-capitan/R-3.6-branch/R-3.6-branch-el-capitan-sa-x86_64.tar.gz",
+                           mac_url = mac_url,
                            permission_to_install = permission_to_install_r)
   
   # Trim R's size -----------------------------------------------------------

From 26dae05d34db2693e9911cade39240206e15faba Mon Sep 17 00:00:00 2001
From: chasemc <cclark42@uic.edu>
Date: Mon, 27 Apr 2020 12:03:32 -0500
Subject: [PATCH 2/2] update nodejs version

---
 R/install_nodejs.R    |  2 +-
 R/meta_function.R     |  2 +-
 man/electrify.Rd      | 30 ++++++++++++++++++++++--------
 man/install_nodejs.Rd | 11 +++++++----
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/R/install_nodejs.R b/R/install_nodejs.R
index d88067fc..c4b341fd 100644
--- a/R/install_nodejs.R
+++ b/R/install_nodejs.R
@@ -12,7 +12,7 @@
 install_nodejs <- function(node_url = "https://nodejs.org/dist",
                            nodejs_path = file.path(system.file(package = "electricShine"), "nodejs"),
                            force_install = FALSE,
-                           nodejs_version = "v10.16.0",
+                           nodejs_version = "v12.16.2",
                            permission_to_install  = FALSE){
   
   
diff --git a/R/meta_function.R b/R/meta_function.R
index e0f109e6..004dec36 100644
--- a/R/meta_function.R
+++ b/R/meta_function.R
@@ -42,7 +42,7 @@ electrify <- function(app_name = NULL,
                       package_install_opts = NULL,
                       run_build = TRUE,
                       nodejs_path = file.path(system.file(package = "electricShine"), "nodejs"),
-                      nodejs_version = "v10.16.0",
+                      nodejs_version = "v12.16.2",
                       permission = FALSE,
                       mac_url = "https://mac.r-project.org/el-capitan/R-3.6-branch/R-3.6-branch-el-capitan-sa-x86_64.tar.gz"){
   
diff --git a/man/electrify.Rd b/man/electrify.Rd
index b6b7d248..c250baef 100644
--- a/man/electrify.Rd
+++ b/man/electrify.Rd
@@ -4,14 +4,26 @@
 \alias{electrify}
 \title{Meta-function}
 \usage{
-electrify(app_name = NULL, product_name = "product_name",
-  short_description = NULL, semantic_version = NULL,
-  build_path = NULL, mran_date = NULL, cran_like_url = NULL,
-  function_name = NULL, git_host = NULL, git_repo = NULL,
-  local_package_path = NULL, package_install_opts = NULL,
-  run_build = TRUE, nodejs_path = file.path(system.file(package =
-  "electricShine"), "nodejs"), nodejs_version = "v10.16.0",
-  permission = FALSE)
+electrify(
+  app_name = NULL,
+  product_name = "product_name",
+  short_description = NULL,
+  semantic_version = NULL,
+  build_path = NULL,
+  mran_date = NULL,
+  cran_like_url = NULL,
+  function_name = NULL,
+  git_host = NULL,
+  git_repo = NULL,
+  local_package_path = NULL,
+  package_install_opts = NULL,
+  run_build = TRUE,
+  nodejs_path = file.path(system.file(package = "electricShine"), "nodejs"),
+  nodejs_version = "v12.16.2",
+  permission = FALSE,
+ 
+    mac_url = "https://mac.r-project.org/el-capitan/R-3.6-branch/R-3.6-branch-el-capitan-sa-x86_64.tar.gz"
+)
 }
 \arguments{
 \item{app_name}{This will be the name of the executable. It's a uniform type identifier (UTI)
@@ -53,6 +65,8 @@ Can also use notation for commits/branch (i.e. "chasemc/demoapp@d81fff0).}
 \item{nodejs_version}{nodejs version to install}
 
 \item{permission}{automatically grant permission to install nodejs and R}
+
+\item{mac_url}{url to mac OS tar.gz}
 }
 \description{
 Meta-function
diff --git a/man/install_nodejs.Rd b/man/install_nodejs.Rd
index 9ab2b071..792410a4 100644
--- a/man/install_nodejs.Rd
+++ b/man/install_nodejs.Rd
@@ -4,10 +4,13 @@
 \alias{install_nodejs}
 \title{Install Node.js}
 \usage{
-install_nodejs(node_url = "https://nodejs.org/dist",
-  nodejs_path = file.path(system.file(package = "electricShine"),
-  "nodejs"), force_install = FALSE, nodejs_version = "v10.16.0",
-  permission_to_install = FALSE)
+install_nodejs(
+  node_url = "https://nodejs.org/dist",
+  nodejs_path = file.path(system.file(package = "electricShine"), "nodejs"),
+  force_install = FALSE,
+  nodejs_version = "v12.16.2",
+  permission_to_install = FALSE
+)
 }
 \arguments{
 \item{node_url}{path to node.js.org}