Merge pull request #51 from rstudio/fix-c6

Fix pip installation on CentOS 6; RStudio, Inc -> PBC

builder/Dockerfile.centos-6

@@ -50,8 +50,8 @@ RUN yum -y update \
     && yum clean all
 
 # Install pip
-RUN curl "https://bootstrap.pypa.io/2.6/get-pip.py" -o "get-pip.py" && \
-    python get-pip.py
+RUN yum install -y epel-release && \
+   yum install -y python-pip
 
 # Install AWS CLI.
 RUN pip install awscli --upgrade --user && \

builder/package.centos-6

@@ -36,12 +36,12 @@ fpm \
   -t rpm \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   --after-install /post-install.sh \
   --after-remove /before-remove.sh \

builder/package.centos-7

@@ -22,12 +22,12 @@ fpm \
   -t rpm \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   --after-install /post-install.sh \
   --after-remove /before-remove.sh \

builder/package.centos-8

@@ -20,12 +20,12 @@ fpm \
   -t rpm \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   --after-install /post-install.sh \
   --after-remove /before-remove.sh \

builder/package.debian-9

@@ -9,12 +9,12 @@ fpm \
   -t deb \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   -p /tmp/output/debian-9/ \
   -d ca-certificates \

builder/package.opensuse-15

@@ -22,12 +22,12 @@ fpm \
   -t rpm \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   --after-install /post-install.sh \
   --after-remove /before-remove.sh \

builder/package.opensuse-42

@@ -22,12 +22,12 @@ fpm \
   -t rpm \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   --after-install /post-install.sh \
   --after-remove /before-remove.sh \

builder/package.ubuntu-1604

@@ -9,12 +9,12 @@ fpm \
   -t deb \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   -p /tmp/output/ubuntu-1604/ \
   -d g++ \

builder/package.ubuntu-1804

@@ -9,12 +9,12 @@ fpm \
   -t deb \
   -v 1 \
   -n R-${R_VERSION} \
-  --vendor "RStudio Inc." \
+  --vendor "RStudio, PBC" \
   --deb-priority "optional" \
   --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
   --url "http://www.r-project.org/" \
   --description "GNU R statistical computation and graphics system" \
-  --maintainer "RStudio Inc https://github.com/rstudio/r-builds" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
   --license "GPL-2" \
   -p /tmp/output/ubuntu-1804/ \
   -d g++ \