Merge pull request #126 from michaelr0/ubuntu-22.04

Add ubuntu 22.04 to the checks
This commit is contained in:
Roni Väyrynen
2022-06-07 10:39:41 +03:00
committed by GitHub
2 changed files with 5 additions and 4 deletions

View File

@@ -43,6 +43,7 @@ Supported Linux distributions and versions:
- Debian 10 - Debian 10
- Debian 9 - Debian 9
- Debian 8 - Debian 8
- Ubuntu 22.04
- Ubuntu 20.04 - Ubuntu 20.04
- Ubuntu 18.04 - Ubuntu 18.04
- Ubuntu 16.04 - Ubuntu 16.04
@@ -135,7 +136,7 @@ deb:
- libpng-dev - libpng-dev
- git - git
- python-minimal - python-minimal
- python2-minimal (Ubuntu 20/Debian 11 only, replaces python-minimal) - python2-minimal (Ubuntu 20/22 or Debian 11 only, replaces python-minimal)
- libvhdi-utils - libvhdi-utils
- lvm2 - lvm2
- nfs-common - nfs-common

View File

@@ -292,7 +292,7 @@ function InstallDependenciesDeb {
printok "Running apt-get update" printok "Running apt-get update"
#determine which python package is needed. Ubuntu 20/Debian 11 require python2-minimal, others have python-minimal #determine which python package is needed. Ubuntu 20/Debian 11 require python2-minimal, others have python-minimal
if [[ "$OSNAME" =~ ^(Ubuntu|Debian)$ ]] && [[ "$OSVERSION" =~ ^(20|11)$ ]]; then if [[ "$OSNAME" =~ ^(Ubuntu|Debian)$ ]] && [[ "$OSVERSION" =~ ^(20|22|11)$ ]]; then
local PYTHON="python2-minimal" local PYTHON="python2-minimal"
else else
local PYTHON="python-minimal" local PYTHON="python-minimal"
@@ -1276,8 +1276,8 @@ function CheckOS {
exit 1 exit 1
fi fi
if [[ "$OSNAME" == "Ubuntu" ]] && [[ ! "$OSVERSION" =~ ^(16|18|20)$ ]]; then if [[ "$OSNAME" == "Ubuntu" ]] && [[ ! "$OSVERSION" =~ ^(16|18|20|22)$ ]]; then
printfail "Only Ubuntu 16/18/20 supported" printfail "Only Ubuntu 16/18/20/22 supported"
exit 1 exit 1
fi fi