add support for no localappdata

felixcheung · felixcheung · commit 7c75073a0bbf · 2017-08-20T19:09:34.000-07:00
diff --git a/R/pkg/R/install.R b/R/pkg/R/install.R
@@ -270,7 +270,11 @@ sparkCachePath <- function() {
   if (is_windows()) {
     winAppPath <- Sys.getenv("LOCALAPPDATA", unset = NA)
     if (is.na(winAppPath)) {
-      stop(paste("%LOCALAPPDATA% not found.",
+      message("%LOCALAPPDATA% not found. Falling back to %USERPROFILE%.")
+      winAppPath <- Sys.getenv("USERPROFILE", unset = NA)
+    }
+    if (is.na(winAppPath)) {
+      stop(paste("%LOCALAPPDATA% and %USERPROFILE% not found.",
                    "Please define the environment variable",
                    "or restart and enter an installation path in localDir."))
     } else {
diff --git a/R/pkg/vignettes/sparkr-vignettes.Rmd b/R/pkg/vignettes/sparkr-vignettes.Rmd
@@ -30,7 +30,7 @@ vignette: >
 ```{r setup, include=FALSE}
 library(knitr)
 opts_hooks$set(eval = function(options) {
-  # override eval only on windows
+  # override eval to FALSE only on windows
   if (.Platform$OS.type == "windows") {
     options$eval = FALSE
   }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ vignette: >`
`30`	`30`	```{r setup, include=FALSE}
`31`	`31`	`library(knitr)`
`32`	`32`	`opts_hooks$set(eval = function(options) {`
`33`		`- # override eval only on windows`
	`33`	`+ # override eval to FALSE only on windows`
`34`	`34`	`if (.Platform$OS.type == "windows") {`
`35`	`35`	`options$eval = FALSE`
`36`	`36`	`}`