Skip to content

Commit 70472b4

Browse files
VirusABCEnchufa2
andauthored
Enable Linux Mint (#36)
* Update os.R Add support for linuxmint * Update zzz_debian_like.R add support for linuxmint * use UBUNTU_CODENAME for pop and linuxmint * bump version, update NEWS --------- Co-authored-by: Iñaki Úcar <iucar@fedoraproject.org>
1 parent b655272 commit 70472b4

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: rspm
22
Type: Package
33
Title: 'RStudio' Package Manager
4-
Version: 0.7.0
4+
Version: 0.7.0.1
55
Authors@R: c(
66
person("Iñaki", "Ucar", email="iucar@fedoraproject.org",
77
role=c("aut", "cph", "cre"), comment=c(ORCID="0000-0001-6403-5550")))

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# rspm devel
2+
3+
- Add support for Linux Mint (#36 addressing #38).
4+
15
# rspm 0.7.0
26

37
- Drop `userdir.R` in favor of `tools::R_user_dir()`, update licensing

R/os.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ os <- function() {
1818
os <- stats::setNames(as.list(os$val), os$var)
1919
code <- switch(
2020
id <- strsplit(os$ID, "-")[[1]][1],
21-
"debian" = , "ubuntu" = , "pop" = os$VERSION_CODENAME,
21+
"debian" = , "ubuntu" = os$VERSION_CODENAME,
22+
"pop" = , "linuxmint" = os$UBUNTU_CODENAME,
2223
"centos" = , "rocky" = , "almalinux" = , "ol" = , "rhel" =
2324
paste0(if ((ver <- safe_version(os$VERSION_ID)$major) < 9)
2425
"centos" else "rhel", ver),

R/zzz_debian_like.R

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
debian_requirements ->
22
ubuntu_requirements ->
3-
pop_requirements
3+
pop_requirements ->
4+
linuxmint_requirements
45

56
debian_install ->
67
ubuntu_install ->
7-
pop_install
8+
pop_install ->
9+
linuxmint_install
810

911
debian_install_sysreqs ->
1012
ubuntu_install_sysreqs ->
11-
pop_install_sysreqs
13+
pop_install_sysreqs ->
14+
linuxmint_install_sysreqs

0 commit comments

Comments
 (0)