Repository: spark Updated Branches: refs/heads/branch-2.1 4f3ce062c -> 975890507
[SPARK-19232][SPARKR] Update Spark distribution download cache location on Windows ## What changes were proposed in this pull request? Windows seems to be the only place with appauthor in the path, for which we should say "Apache" (and case sensitive) Current path of `AppData\Local\spark\spark\Cache` is a bit odd. ## How was this patch tested? manual. Author: Felix Cheung <felixcheun...@hotmail.com> Closes #16590 from felixcheung/rcachedir. (cherry picked from commit a115a54399cd4bedb1a5086943a88af6339fbe85) Signed-off-by: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/97589050 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/97589050 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/97589050 Branch: refs/heads/branch-2.1 Commit: 97589050714901139b6fda358916ef64c3bbd78c Parents: 4f3ce06 Author: Felix Cheung <felixcheun...@hotmail.com> Authored: Mon Jan 16 09:35:52 2017 -0800 Committer: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Committed: Mon Jan 16 09:36:00 2017 -0800 ---------------------------------------------------------------------- R/pkg/R/install.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/97589050/R/pkg/R/install.R ---------------------------------------------------------------------- diff --git a/R/pkg/R/install.R b/R/pkg/R/install.R index 097b7ad..cb6bbe5 100644 --- a/R/pkg/R/install.R +++ b/R/pkg/R/install.R @@ -50,7 +50,7 @@ #' \itemize{ #' \item Mac OS X: \file{~/Library/Caches/spark} #' \item Unix: \env{$XDG_CACHE_HOME} if defined, otherwise \file{~/.cache/spark} -#' \item Windows: \file{\%LOCALAPPDATA\%\\spark\\spark\\Cache}. +#' \item Windows: \file{\%LOCALAPPDATA\%\\Apache\\Spark\\Cache}. #' } #' @param overwrite If \code{TRUE}, download and overwrite the existing tar file in localDir #' and force re-install Spark (in case the local directory or file is corrupted) @@ -239,7 +239,7 @@ sparkCachePath <- function() { "or restart and enter an installation path in localDir.") stop(msg) } else { - path <- file.path(winAppPath, "spark", "spark", "Cache") + path <- file.path(winAppPath, "Apache", "Spark", "Cache") } } else if (.Platform$OS.type == "unix") { if (Sys.info()["sysname"] == "Darwin") { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
