From d353cee6346ff1c1dfb5bbfb2250649090ddbd64 Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Fri, 3 May 2019 15:30:24 -0500
Subject: [PATCH 1/2] Set PAGER for Ubuntu and Debian only

/usr/bin/pager is specific to Debian/Ubuntu. For other OSs, use the default
pager detected by the configure script, which will either be less or more.

See https://github.com/rstudio/r-builds/issues/3
---
 builder/Dockerfile.debian-9    | 3 +++
 builder/Dockerfile.ubuntu-1604 | 3 +++
 builder/Dockerfile.ubuntu-1804 | 3 +++
 builder/build.sh               | 1 -
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/builder/Dockerfile.debian-9 b/builder/Dockerfile.debian-9
index ee81ede..57ce5a7 100644
--- a/builder/Dockerfile.debian-9
+++ b/builder/Dockerfile.debian-9
@@ -13,5 +13,8 @@ RUN pip install awscli
 
 RUN chmod 0777 /opt
 
+# Override the default pager used by R
+ENV PAGER /usr/bin/pager
+
 COPY build.sh .
 ENTRYPOINT ./build.sh
diff --git a/builder/Dockerfile.ubuntu-1604 b/builder/Dockerfile.ubuntu-1604
index 4f0e410..3c88ba1 100644
--- a/builder/Dockerfile.ubuntu-1604
+++ b/builder/Dockerfile.ubuntu-1604
@@ -13,5 +13,8 @@ RUN pip install awscli
 
 RUN chmod 0777 /opt
 
+# Override the default pager used by R
+ENV PAGER /usr/bin/pager
+
 COPY build.sh .
 ENTRYPOINT ./build.sh
diff --git a/builder/Dockerfile.ubuntu-1804 b/builder/Dockerfile.ubuntu-1804
index 8d9039c..2bb5ca9 100644
--- a/builder/Dockerfile.ubuntu-1804
+++ b/builder/Dockerfile.ubuntu-1804
@@ -13,5 +13,8 @@ RUN pip install awscli
 
 RUN chmod 0777 /opt
 
+# Override the default pager used by R
+ENV PAGER /usr/bin/pager
+
 COPY build.sh .
 ENTRYPOINT ./build.sh
diff --git a/builder/build.sh b/builder/build.sh
index c53f5fc..123d6e5 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -73,7 +73,6 @@ compile_r() {
   # set some common environment variables for the configure step
   AWK=/usr/bin/awk \
   LIBnn=lib \
-  PAGER=/usr/bin/pager \
   PERL=/usr/bin/perl \
   R_PDFVIEWER=xdg-open \
   R_BROWSER=xdg-open \

From 85f18aec477ed4efbc434e4b23ba1a3e7912d44e Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Fri, 3 May 2019 15:40:26 -0500
Subject: [PATCH 2/2] Remove dependency on less for CentOS

The configure script will choose less as the default pager if installed.
Don't require less as a dependency for the R binaries.
---
 builder/Dockerfile.centos-6 | 1 -
 builder/Dockerfile.centos-7 | 1 -
 2 files changed, 2 deletions(-)

diff --git a/builder/Dockerfile.centos-6 b/builder/Dockerfile.centos-6
index 685d668..c59d9ab 100644
--- a/builder/Dockerfile.centos-6
+++ b/builder/Dockerfile.centos-6
@@ -17,7 +17,6 @@ RUN yum -y update \
     krb5-devel \
     krb5-libs \
     lapack-devel \
-    less \
     libICE-devel \
     libSM-devel \
     libX11-devel \
diff --git a/builder/Dockerfile.centos-7 b/builder/Dockerfile.centos-7
index e2533c7..3644d9c 100644
--- a/builder/Dockerfile.centos-7
+++ b/builder/Dockerfile.centos-7
@@ -16,7 +16,6 @@ RUN yum -y update \
     java-1.8.0-openjdk-devel \
     java-1.8.0-openjdk-headless \
     lapack-devel \
-    less \
     libICE-devel \
     libSM-devel \
     libX11-devel \