concise message, improve doc for windows, fix regex match

Author: junyangq

R/check-cran.sh

@@ -47,6 +47,6 @@ $FWDIR/create-docs.sh
 
 VERSION=`grep Version $FWDIR/pkg/DESCRIPTION | awk '{print $NF}'`
 
-"$R_SCRIPT_PATH/"R CMD check --as-cran --no-tests SparkR_"$VERSION".tar.gz 
+"$R_SCRIPT_PATH/"R CMD check --as-cran SparkR_"$VERSION".tar.gz
 
 popd > /dev/null

R/pkg/R/install.R

@@ -36,7 +36,7 @@
 #' \code{without-hadoop}.
 #'
 #' @param hadoopVersion Version of Hadoop to install. Default is \code{"2.7"}. It can take other
-#'                      version number in the format of "int.int".
+#'                      version number in the format of "x.y" where x and y are integer.
 #'                      If \code{hadoopVersion = "without"}, "Hadoop free" build is installed.
 #'                      See
 #'                      \href{http://spark.apache.org/docs/latest/hadoop-provided.html}{
@@ -50,11 +50,9 @@
 #'                 \itemize{
 #'                   \item Mac OS X: \file{~/Library/Caches/spark}
 #'                   \item Unix: \env{$XDG_CACHE_HOME} if defined, otherwise \file{~/.cache/spark}
-#'                   \item Win XP:
-#'                         \file{C:\\Documents and Settings\\<username>\\Local Settings\\Application
-#'                         Data\\spark\\spark\\Cache}
-#'                   \item Win Vista:
-#'                         \file{C:\\Users\\<username>\\AppData\\Local\\spark\\spark\\Cache}
+#'                   \item Windows: \file{\%LOCALAPPDATA\%\\spark\\spark\\Cache}. See
+#'                         \href{https://www.microsoft.com/security/portal/mmpc/shared/variables.aspx}{
+#'                         Windows Common Folder Variables} about \%LOCALAPPDATA\%
 #'                 }
 #' @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)
@@ -210,7 +208,7 @@ hadoop_version_name <- function(hadoopVersion) {
 spark_cache_path <- function() {
   if (.Platform$OS.type == "windows") {
     winAppPath <- Sys.getenv("%LOCALAPPDATA%", unset = NA)
-    if (is.null(winAppPath)) {
+    if (is.na(winAppPath)) {
       msg <- paste("%LOCALAPPDATA% not found.",
                    "Please define the environment variable",
                    "or restart and enter an installation path in localDir.")

R/pkg/R/sparkR.R

@@ -365,19 +365,19 @@ sparkR.session <- function(
     }
     overrideEnvs(sparkConfigMap, paramMap)
   }
+  # do not download if it is run in the sparkR shell
   if (!grepl(".*shell\\.R$", Sys.getenv("R_PROFILE_USER"), perl = TRUE)) {
     if (!nzchar(master) || is_master_local(master)) {
       if (is.na(file.info(sparkHome)$isdir)) {
-        fmt <- paste0("Spark not found in SPARK_HOME: %s.\n",
-                      "To search in the cache directory. ",
+        msg <- paste0("Spark not found in SPARK_HOME: ",
+                      sparkHome,
+                      " .\nTo search in the cache directory. ",
                       "Installation will start if not found.")
-        msg <- sprintf(fmt, sparkHome)
         message(msg)
         packageLocalDir <- install.spark()
         sparkHome <- packageLocalDir
       } else {
-        fmt <- "Spark package is found in SPARK_HOME: %s"
-        msg <- sprintf(fmt, sparkHome)
+        msg <- paste0("Spark package is found in SPARK_HOME: ", sparkHome)
         message(msg)
       }
     }

R/pkg/R/utils.R

@@ -691,5 +691,5 @@ getSparkContext <- function() {
 }
 
 is_master_local <- function(master) {
-  grepl("^local(\\[[0-9\\*]+\\])?$", master, perl = TRUE)
+  grepl("^local(\\[([0-9]+|\\*)\\])?$", master, perl = TRUE)
 }