|
18 | 18 | # License and version |
19 | 19 | SERIAL=GPL |
20 | 20 | KEY=GPL |
21 | | -VER=6.1.1 |
| 21 | +VER=6.2.0 |
22 | 22 | vm_version=6 |
23 | 23 |
|
24 | 24 | # Currently supported systems: |
25 | 25 | supported=" CentOS/RHEL Linux 6, 7, and 8 on x86_64 |
26 | 26 | Debian 8, 9, and 10 on i386 and amd64 |
27 | | - Ubuntu 16.04 LTS and 18.04 LTS on i386 and amd64" |
| 27 | + Ubuntu 16.04 LTS, 18.04 LTS, and 20.04 LTS on i386 and amd64" |
28 | 28 |
|
29 | 29 | log=/root/virtualmin-install.log |
30 | 30 | skipyesno=0 |
@@ -622,13 +622,13 @@ install_virtualmin_release () { |
622 | 622 | fi |
623 | 623 | ;; |
624 | 624 | ubuntu) |
625 | | - if [ "$os_version" != "14.04" ] && [ "$os_version" != "16.04" ] && [ "$os_version" != "18.04" ]; then |
| 625 | + if [ "$os_version" != "16.04" ] && [ "$os_version" != "18.04" ] && [ "$os_version" != "20.04" ]; then |
626 | 626 | printf "${RED}${os_type} ${os_version} is not supported by this installer.${NORMAL}\\n" |
627 | 627 | exit 1 |
628 | 628 | fi |
629 | 629 | ;; |
630 | 630 | debian) |
631 | | - if [ "$os_major_version" -lt 7 ]; then |
| 631 | + if [ "$os_major_version" -lt 9 ]; then |
632 | 632 | printf "${RED}${os_type} ${os_version} is not supported by this installer.${NORMAL}\\n" |
633 | 633 | exit 1 |
634 | 634 | fi |
@@ -670,23 +670,19 @@ install_virtualmin_release () { |
670 | 670 | if [ "$os_type" = "ubuntu" ]; then |
671 | 671 | deps="$ubudeps" |
672 | 672 | case "$os_version" in |
673 | | - 14.04*) |
674 | | - run_ok "add-apt-repository -y ppa:ondrej/php" "Enabling PHP 7 PPA" |
675 | | - repos="virtualmin-trusty virtualmin-universal" |
676 | | - ;; |
677 | 673 | 16.04*) |
678 | 674 | repos="virtualmin-xenial virtualmin-universal" |
679 | 675 | ;; |
680 | 676 | 18.04*) |
681 | 677 | repos="virtualmin-bionic virtualmin-universal" |
682 | 678 | ;; |
| 679 | + 20.04*) |
| 680 | + repos="virtualmin-focal virtualmin-universal" |
| 681 | + ;; |
683 | 682 | esac |
684 | 683 | else |
685 | 684 | deps="$debdeps" |
686 | 685 | case "$os_version" in |
687 | | - 7*) |
688 | | - repos="virtualmin-wheezy virtualmin-universal" |
689 | | - ;; |
690 | 686 | 8*) |
691 | 687 | run_ok "apt-get install --assume-yes apt-transport-https lsb-release ca-certificates" "Installing extra dependencies for Debian 8" |
692 | 688 | download 'https://packages.sury.org/php/apt.gpg' |
|
0 commit comments