Consistency changes (#43)

Oefenweb · Feb 27, 2020 · 10b8f3b · 10b8f3b
1 parent 9b83ba4
commit 10b8f3b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 ---
 sudo: required
-dist: trusty
+dist: xenial
 
 language: python
 python: "2.7"

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Set up the latest version of R in Ubuntu systems.
 
 #### Variables
 
-* `r_version_35`: [default: `false`, for Ubuntu >= `18.04` always `true`]: Whether or not to install R 3.5
+* `r_version_35`: [default: `false`, for `Ubuntu >= 18.04` always `true`]: Whether or not to install R 3.5+
 
 * `r_cran_mirror`: [default: `https://cran.rstudio.com/`]: Your favorite [CRAN mirror](https://cran.r-project.org/mirrors.html)
 * `r_bioclite_url`: [default: `https://bioconductor.org/biocLite.R`]: The `biocLite.R` script URL for [Bioconductor](https://bioconductor.org/) installs

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,6 +1,6 @@
 # defaults file for r
 ---
-r_version_35: "{{ ansible_distribution_version is version('18.04', '>=') }}"
+r_version_35: "{{ (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '>=')) }}"
 
 r_cran_mirror: https://cran.rstudio.com/
 r_bioclite_url: https://bioconductor.org/biocLite.R

diff --git a/vars/main.yml b/vars/main.yml
@@ -2,7 +2,7 @@
 ---
 r_repository:
   - type: deb
-    url: "{{ r_cran_mirror }}/bin/linux/ubuntu {{ ansible_distribution_release }}{{ r_version_35 | ternary('-cran35', '') }}/"
+    url: "{{ r_cran_mirror }}/bin/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }}{{ r_version_35 | ternary('-cran35', '') }}/"
 
 r_dependencies_dummy_package: apt
 r_dependencies: