diff --git a/README.md b/README.md index 1170fd7..0ca0274 100644 --- a/README.md +++ b/README.md @@ -110,10 +110,11 @@ sudo yum install R-${R_VERSION}-1-1.x86_64.rpm #### SUSE Linux -Enable the [Science](https://en.opensuse.org/openSUSE:Science_Repositories) repository (SLES 12 only): +Enable the Python backports repository (SLES 12 only): ```bash # SLES 12 -sudo zypper --gpg-auto-import-keys addrepo https://download.opensuse.org/repositories/science/SLE_12/science.repo +VERSION="SLE_$(grep "^VERSION=" /etc/os-release | sed -e 's/VERSION=//' -e 's/"//g' -e 's/-/_/')" +sudo zypper --gpg-auto-import-keys addrepo https://download.opensuse.org/repositories/devel:/languages:/python:/backports/$VERSION/devel:languages:python:backports.repo ``` Download the rpm package: diff --git a/builder/Dockerfile.centos-6 b/builder/Dockerfile.centos-6 index 71d60a2..a70520a 100644 --- a/builder/Dockerfile.centos-6 +++ b/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 && \ diff --git a/builder/package.centos-6 b/builder/package.centos-6 index beb371b..93fadd8 100644 --- a/builder/package.centos-6 +++ b/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 \ diff --git a/builder/package.centos-7 b/builder/package.centos-7 index e35430d..e927d8f 100644 --- a/builder/package.centos-7 +++ b/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 \ diff --git a/builder/package.centos-8 b/builder/package.centos-8 index 42f2c1c..a873d1d 100644 --- a/builder/package.centos-8 +++ b/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 \ diff --git a/builder/package.debian-9 b/builder/package.debian-9 index 620dd48..eb536bf 100644 --- a/builder/package.debian-9 +++ b/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 \ diff --git a/builder/package.opensuse-15 b/builder/package.opensuse-15 index 83a3ecf..db01d67 100644 --- a/builder/package.opensuse-15 +++ b/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 \ diff --git a/builder/package.opensuse-42 b/builder/package.opensuse-42 index 714b8bb..5bf8221 100644 --- a/builder/package.opensuse-42 +++ b/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 \ diff --git a/builder/package.ubuntu-1604 b/builder/package.ubuntu-1604 index fc5b187..395020d 100644 --- a/builder/package.ubuntu-1604 +++ b/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++ \ diff --git a/builder/package.ubuntu-1804 b/builder/package.ubuntu-1804 index a1ac4de..2e59f8f 100644 --- a/builder/package.ubuntu-1804 +++ b/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++ \ diff --git a/install.sh b/install.sh index f2c7a25..7de8dd7 100755 --- a/install.sh +++ b/install.sh @@ -291,7 +291,7 @@ install_pre () { install_epel "${ver}" ;; "SLES12") - install_sci + install_python_backports ;; "LEAP12" | "LEAP15" | "SLES15") ;; @@ -317,9 +317,10 @@ install_epel () { esac } -# Installs the Science repository for SLES 12 -install_sci () { - ${SUDO} zypper --gpg-auto-import-keys addrepo https://download.opensuse.org/repositories/science/SLE_12/science.repo +# Installs the Python backports repository for SLES 12 +install_python_backports () { + SLE_VERSION="SLE_$(grep "^VERSION=" /etc/os-release | sed -e 's/VERSION=//' -e 's/"//g' -e 's/-/_/')" + ${SUDO} zypper --gpg-auto-import-keys addrepo https://download.opensuse.org/repositories/devel:/languages:/python:/backports/$SLE_VERSION/devel:languages:python:backports.repo } do_download () {