diff --git a/README.md b/README.md index 444b047..3fb971e 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ Supported Linux distributions and versions: - CentOS 8 - AlmaLinux 8 - Rocky Linux 8 +- Debian 11 - Debian 10 - Debian 9 - Debian 8 @@ -116,12 +117,12 @@ deb: - libpng-dev - git - python-minimal -- python2-minimal (Ubuntu 20 only, replaces python-minimal) +- python2-minimal (Ubuntu 20/Debian 11 only, replaces python-minimal) - libvhdi-utils - lvm2 - nfs-common - cifs-utils -- gnupg (debian 10) +- gnupg (debian 10/11) - software-properties-common (ubuntu) ``` diff --git a/xo-install.sh b/xo-install.sh index 047ca2e..7a524df 100755 --- a/xo-install.sh +++ b/xo-install.sh @@ -232,8 +232,8 @@ function InstallDependenciesDeb { runcmd "apt-get update" printok "Running apt-get update" - #determine which python package is needed. Ubuntu 20 requires python2-minimal, 16 and 18 are python-minimal - if [[ "$OSNAME" == "Ubuntu" ]] && [[ "$OSVERSION" == "20" ]]; then + #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 local PYTHON="python2-minimal" else local PYTHON="python-minimal" @@ -251,11 +251,11 @@ function InstallDependenciesDeb { runcmd "apt-get install -y apt-transport-https ca-certificates" printok "Installing apt-transport-https and ca-certificates packages to support https repos" - if [[ "$OSNAME" == "Debian" ]] && [[ "$OSVERSION" == "10" ]]; then + if [[ "$OSNAME" == "Debian" ]] && [[ "$OSVERSION" =~ ^(10|11)$ ]]; then echo - printprog "Debian 10, so installing gnupg also" + printprog "Debian 10/11, so installing gnupg also" runcmd "apt-get install gnupg -y" - printok "Debian 10, so installing gnupg also" + printok "Debian 10/11, so installing gnupg also" fi # install setcap for non-root port binding if missing @@ -928,8 +928,8 @@ function CheckOS { exit 1 fi - if [[ "$OSNAME" == "Debian" ]] && [[ ! "$OSVERSION" =~ ^(8|9|10)$ ]]; then - printfail "Only Debian 8/9/10 supported" + if [[ "$OSNAME" == "Debian" ]] && [[ ! "$OSVERSION" =~ ^(8|9|10|11)$ ]]; then + printfail "Only Debian 8/9/10/11 supported" exit 1 fi