devxy/r-builds
Watch
2
0
Fork
You've already forked r-builds
 0
Code Issues 1 Pull requests Releases Activity

Set PAGER for Ubuntu and Debian only

Browse source 
/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
This commit is contained in:
Greg Lin 2019-05-03 15:30:24 -05:00
commit d353cee634
4 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
builder/Dockerfile.debian-9
View file

@ -13,5 +13,8 @@ RUN pip install awscli
RUN chmod 0777 /opt RUN chmod 0777 /opt
# Override the default pager used by R
ENV PAGER /usr/bin/pager
COPY build.sh . COPY build.sh .
ENTRYPOINT ./build.sh ENTRYPOINT ./build.sh

3
builder/Dockerfile.ubuntu-1604
View file

@ -13,5 +13,8 @@ RUN pip install awscli
RUN chmod 0777 /opt RUN chmod 0777 /opt
# Override the default pager used by R
ENV PAGER /usr/bin/pager
COPY build.sh . COPY build.sh .
ENTRYPOINT ./build.sh ENTRYPOINT ./build.sh

3
builder/Dockerfile.ubuntu-1804
View file

@ -13,5 +13,8 @@ RUN pip install awscli
RUN chmod 0777 /opt RUN chmod 0777 /opt
# Override the default pager used by R
ENV PAGER /usr/bin/pager
COPY build.sh . COPY build.sh .
ENTRYPOINT ./build.sh ENTRYPOINT ./build.sh

1
builder/build.sh
View file

@ -73,7 +73,6 @@ compile_r() {
# set some common environment variables for the configure step # set some common environment variables for the configure step
AWK=/usr/bin/awk \ AWK=/usr/bin/awk \
LIBnn=lib \ LIBnn=lib \
PAGER=/usr/bin/pager \
PERL=/usr/bin/perl \ PERL=/usr/bin/perl \
R_PDFVIEWER=xdg-open \ R_PDFVIEWER=xdg-open \
R_BROWSER=xdg-open \ R_BROWSER=xdg-open \