From 5027b09c558b024e0ee4bc7bcf077a061d22c33a Mon Sep 17 00:00:00 2001
From: HyukjinKwon <gurwls223@apache.org>
Date: Tue, 23 Jun 2020 22:08:00 +0900
Subject: [PATCH] [SPARK-32074][BUILD][R] Update AppVeyor R version to 4.0.2

---
 R/install-dev.bat                     | 8 +++++++-
 dev/appveyor-install-dependencies.ps1 | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/R/install-dev.bat b/R/install-dev.bat
index ed1c91ae3a0ff..c570d93049a14 100644
--- a/R/install-dev.bat
+++ b/R/install-dev.bat
@@ -24,7 +24,13 @@ set SPARK_HOME=%~dp0..
 
 MKDIR %SPARK_HOME%\R\lib
 
-R.exe CMD INSTALL --library="%SPARK_HOME%\R\lib"  %SPARK_HOME%\R\pkg\
+rem When you pass the package path directly as an argument to R CMD INSTALL,
+rem it takes the path as 'C:\projects\spark\R\..\R\pkg"' as an example at
+rem R 4.0. To work around this, directly go to the directoy and install it.
+rem See also SPARK-32074
+pushd %SPARK_HOME%\R\pkg\
+R.exe CMD INSTALL --library="%SPARK_HOME%\R\lib" .
+popd
 
 rem Zip the SparkR package so that it can be distributed to worker nodes on YARN
 pushd %SPARK_HOME%\R\lib
diff --git a/dev/appveyor-install-dependencies.ps1 b/dev/appveyor-install-dependencies.ps1
index 4be420b4e8594..87eb82935e4e0 100644
--- a/dev/appveyor-install-dependencies.ps1
+++ b/dev/appveyor-install-dependencies.ps1
@@ -115,8 +115,8 @@ $env:Path += ";$env:HADOOP_HOME\bin"
 Pop-Location
 
 # ========================== R
-$rVer = "3.6.2"
-$rToolsVer = "4.0.0"
+$rVer = "4.0.2"
+$rToolsVer = "4.0.2"
 
 InstallR
 InstallRtools