From 865849a77edfc62a81838784667d422396871198 Mon Sep 17 00:00:00 2001
From: eitsupi <ts1s1andn@gmail.com>
Date: Tue, 29 Jun 2021 18:37:22 +0900
Subject: [PATCH 1/3] Changing the default repository for arm64 images

---
 scripts/install_R.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/install_R.sh b/scripts/install_R.sh
index 547b0a3e..807141e4 100755
--- a/scripts/install_R.sh
+++ b/scripts/install_R.sh
@@ -11,6 +11,11 @@ CRAN=${CRAN:-https://cran.r-project.org}
 ##  mechanism to force source installs if we're using RSPM
 CRAN_SOURCE=${CRAN/"__linux__/$UBUNTU_VERSION/"/""}
 
+## source install if using RSPM and arm64 image
+if [ "$(uname -m)" = "aarch64" ]; then
+    CRAN=$CRAN_SOURCE
+fi
+
 export DEBIAN_FRONTEND=noninteractive
 
 # Set up and install R

From b5469fc63d96883f011c89e39874df621f63dca8 Mon Sep 17 00:00:00 2001
From: eitsupi <ts1s1andn@gmail.com>
Date: Tue, 29 Jun 2021 18:38:50 +0900
Subject: [PATCH 2/3] Remove references to the CRAN env var from scripts

---
 scripts/install_tidyverse.sh | 6 +++---
 scripts/install_verse.sh     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/install_tidyverse.sh b/scripts/install_tidyverse.sh
index 911e6984..620a3bbd 100755
--- a/scripts/install_tidyverse.sh
+++ b/scripts/install_tidyverse.sh
@@ -18,7 +18,7 @@ apt-get update -qq && apt-get -y --no-install-recommends install \
     unixodbc-dev && \
   rm -rf /var/lib/apt/lists/*
 
-install2.r --error --skipinstalled -r $CRAN -n $NCPUS \
+install2.r --error --skipinstalled -n $NCPUS \
     tidyverse \
     devtools \
     rmarkdown \
@@ -27,7 +27,7 @@ install2.r --error --skipinstalled -r $CRAN -n $NCPUS \
     gert
 
 ## dplyr database backends
-install2.r --error --skipinstalled -r $CRAN -n $NCPUS \
+install2.r --error --skipinstalled -n $NCPUS \
     arrow \
     dbplyr \
     DBI \
@@ -40,6 +40,6 @@ install2.r --error --skipinstalled -r $CRAN -n $NCPUS \
     fst
 
 ## a bridge to far? -- brings in another 60 packages
-# install2.r --error --skipinstalled -r $CRAN -n $NCPUS tidymodels
+# install2.r --error --skipinstalled -n $NCPUS tidymodels
 
  rm -rf /tmp/downloaded_packages
diff --git a/scripts/install_verse.sh b/scripts/install_verse.sh
index d0c64522..319a2441 100755
--- a/scripts/install_verse.sh
+++ b/scripts/install_verse.sh
@@ -49,7 +49,7 @@ fi
 # So: we can build the redland package bindings and then swap back to libcurl-openssl-dev... (ick)
 # explicitly install runtime library sub-deps of librdf0-dev so they are not auto-removed.
 apt-get install -y librdf0-dev
-install2.r --error --skipinstalled -r $CRAN redland
+install2.r --error --skipinstalled -r redland
 apt-get install -y \
 	libcurl4-openssl-dev \
 	libxslt-dev \
@@ -70,8 +70,8 @@ wget "https://travis-bin.yihui.name/texlive-local.deb" \
 ## Install texlive
 /rocker_scripts/install_texlive.sh
 
-install2.r --error -r $CRAN --skipinstalled tinytex
-install2.r --error --deps TRUE -r $CRAN --skipinstalled \
+install2.r --error -r --skipinstalled tinytex
+install2.r --error --deps TRUE -r --skipinstalled \
     blogdown bookdown rticles rmdshower rJava xaringan
 
 rm -rf /tmp/downloaded_packages

From 65b754834e8c3289162921bec166b5d460b58eb4 Mon Sep 17 00:00:00 2001
From: eitsupi <ts1s1andn@gmail.com>
Date: Sun, 11 Jul 2021 22:45:17 +0900
Subject: [PATCH 3/3] fix typo

---
 scripts/install_verse.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install_verse.sh b/scripts/install_verse.sh
index 319a2441..35c3d488 100755
--- a/scripts/install_verse.sh
+++ b/scripts/install_verse.sh
@@ -49,7 +49,7 @@ fi
 # So: we can build the redland package bindings and then swap back to libcurl-openssl-dev... (ick)
 # explicitly install runtime library sub-deps of librdf0-dev so they are not auto-removed.
 apt-get install -y librdf0-dev
-install2.r --error --skipinstalled -r redland
+install2.r --error --skipinstalled redland
 apt-get install -y \
 	libcurl4-openssl-dev \
 	libxslt-dev \
@@ -70,8 +70,8 @@ wget "https://travis-bin.yihui.name/texlive-local.deb" \
 ## Install texlive
 /rocker_scripts/install_texlive.sh
 
-install2.r --error -r --skipinstalled tinytex
-install2.r --error --deps TRUE -r --skipinstalled \
+install2.r --error --skipinstalled tinytex
+install2.r --error --deps TRUE --skipinstalled \
     blogdown bookdown rticles rmdshower rJava xaringan
 
 rm -rf /tmp/downloaded_packages