Simplify RHEL detection

* add 7.x versions explicitly to distro table * remove rhel special casing.
r-lib · Sep 11, 2024 · 06d0d42 · 06d0d42
1 parent 6cb6cdf
commit 06d0d42
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 11 deletions.
diff --git a/R/sysreqs.R b/R/sysreqs.R
@@ -347,9 +347,6 @@ parse_sysreqs_platform <- function(x) {
     osplt$distribution <- restpcs[1]
     osplt$version <- paste0(restpcs[-1], collapse = "-")
   }
-  if (osplt$distribution == "rhel" || osplt$distribution == "redhat") {
-    osplt$version = strsplit(osplt$version, "[.]")[[1]][1]
-  }
   osplt
 }
 

diff --git a/R/sysreqs2.R b/R/sysreqs2.R
@@ -18,6 +18,16 @@ sysreqs2_cmds <- utils::read.table(
    'Red Hat Enterprise Linux' linux   redhat       6         NA                  'yum install -y'                    rpm
    'Red Hat Enterprise Linux' linux   redhat       7         NA                  'yum install -y'                    rpm
    'Red Hat Enterprise Linux' linux   redhat       *         NA                  'dnf install -y'                    rpm
+   'Red Hat Enterprise Linux' linux   rhel         7.0       NA                  'yum install -y'                    rpm
+   'Red Hat Enterprise Linux' linux   rhel         7.1       NA                  'yum install -y'                    rpm
+   'Red Hat Enterprise Linux' linux   rhel         7.2       NA                  'yum install -y'                    rpm
+   'Red Hat Enterprise Linux' linux   rhel         7.3       NA                  'yum install -y'                    rpm
+   'Red Hat Enterprise Linux' linux   rhel         7.4       NA                  'yum install -y'                    rpm
+   'Red Hat Enterprise Linux' linux   rhel         7.5       NA                  'yum install -y'                    rpm
+   'Red Hat Enterprise Linux' linux   rhel         7.6       NA                  'yum install -y'                    rpm
+   'Red Hat Enterprise Linux' linux   rhel         7.7       NA                  'yum install -y'                    rpm
+   'Red Hat Enterprise Linux' linux   rhel         7.8       NA                  'yum install -y'                    rpm
+   'Red Hat Enterprise Linux' linux   rhel         7.9       NA                  'yum install -y'                    rpm
    'Red Hat Enterprise Linux' linux   rhel         *         NA                  'dnf install -y'                    rpm
    'Fedora Linux'             linux   fedora       *         NA                  'dnf install -y'                    rpm
    'openSUSE Linux'           linux   opensuse     *         NA                  'zypper --non-interactive install'  rpm

diff --git a/tests/testthat/_snaps/sysreqs.md b/tests/testthat/_snaps/sysreqs.md
@@ -1,9 +1,9 @@
 # sysreqs_platforms
 
     Code
-      sysreqs_platforms()
+      print(sysreqs_platforms(), n = Inf)
     Output
-      # A data frame: 12 x 7
+      # A data frame: 22 x 7
          name  os    distribution version update_command install_command query_command
          <chr> <chr> <chr>        <chr>   <chr>          <chr>           <chr>        
        1 Ubun~ linux ubuntu       *       apt-get -y up~ apt-get -y ins~ dpkg-query   
@@ -13,11 +13,21 @@
        5 Red ~ linux redhat       6       <NA>           yum install -y  rpm          
        6 Red ~ linux redhat       7       <NA>           yum install -y  rpm          
        7 Red ~ linux redhat       *       <NA>           dnf install -y  rpm          
-       8 Red ~ linux rhel         *       <NA>           dnf install -y  rpm          
-       9 Fedo~ linux fedora       *       <NA>           dnf install -y  rpm          
-      10 open~ linux opensuse     *       <NA>           zypper --non-i~ rpm          
-      11 SUSE~ linux sle          *       <NA>           zypper --non-i~ rpm          
-      12 Alpi~ linux alpine       *       <NA>           apk add --no-c~ apk          
+       8 Red ~ linux rhel         7.0     <NA>           yum install -y  rpm          
+       9 Red ~ linux rhel         7.1     <NA>           yum install -y  rpm          
+      10 Red ~ linux rhel         7.2     <NA>           yum install -y  rpm          
+      11 Red ~ linux rhel         7.3     <NA>           yum install -y  rpm          
+      12 Red ~ linux rhel         7.4     <NA>           yum install -y  rpm          
+      13 Red ~ linux rhel         7.5     <NA>           yum install -y  rpm          
+      14 Red ~ linux rhel         7.6     <NA>           yum install -y  rpm          
+      15 Red ~ linux rhel         7.7     <NA>           yum install -y  rpm          
+      16 Red ~ linux rhel         7.8     <NA>           yum install -y  rpm          
+      17 Red ~ linux rhel         7.9     <NA>           yum install -y  rpm          
+      18 Red ~ linux rhel         *       <NA>           dnf install -y  rpm          
+      19 Fedo~ linux fedora       *       <NA>           dnf install -y  rpm          
+      20 open~ linux opensuse     *       <NA>           zypper --non-i~ rpm          
+      21 SUSE~ linux sle          *       <NA>           zypper --non-i~ rpm          
+      22 Alpi~ linux alpine       *       <NA>           apk add --no-c~ apk          
 
 # sysreqs_db_list
 

diff --git a/tests/testthat/test-sysreqs.R b/tests/testthat/test-sysreqs.R
@@ -1,6 +1,6 @@
 
 test_that("sysreqs_platforms", {
-  expect_snapshot(sysreqs_platforms())
+  expect_snapshot(print(sysreqs_platforms(), n = Inf))
 })
 
 test_that("sysreqs_db_list", {