Skip to content

Commit c473b7f

Browse files
committed
Add Ubuntu 20.04 LTS support, drop older distros virtualmin/virtualmin-lamp-stack-ubu@0e86755
1 parent ef70a28 commit c473b7f

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

virtualmin-install.sh

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
# License and version
1919
SERIAL=GPL
2020
KEY=GPL
21-
VER=6.1.1
21+
VER=6.2.0
2222
vm_version=6
2323

2424
# Currently supported systems:
2525
supported=" CentOS/RHEL Linux 6, 7, and 8 on x86_64
2626
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"
2828

2929
log=/root/virtualmin-install.log
3030
skipyesno=0
@@ -622,13 +622,13 @@ install_virtualmin_release () {
622622
fi
623623
;;
624624
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
626626
printf "${RED}${os_type} ${os_version} is not supported by this installer.${NORMAL}\\n"
627627
exit 1
628628
fi
629629
;;
630630
debian)
631-
if [ "$os_major_version" -lt 7 ]; then
631+
if [ "$os_major_version" -lt 9 ]; then
632632
printf "${RED}${os_type} ${os_version} is not supported by this installer.${NORMAL}\\n"
633633
exit 1
634634
fi
@@ -670,23 +670,19 @@ install_virtualmin_release () {
670670
if [ "$os_type" = "ubuntu" ]; then
671671
deps="$ubudeps"
672672
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-
;;
677673
16.04*)
678674
repos="virtualmin-xenial virtualmin-universal"
679675
;;
680676
18.04*)
681677
repos="virtualmin-bionic virtualmin-universal"
682678
;;
679+
20.04*)
680+
repos="virtualmin-focal virtualmin-universal"
681+
;;
683682
esac
684683
else
685684
deps="$debdeps"
686685
case "$os_version" in
687-
7*)
688-
repos="virtualmin-wheezy virtualmin-universal"
689-
;;
690686
8*)
691687
run_ok "apt-get install --assume-yes apt-transport-https lsb-release ca-certificates" "Installing extra dependencies for Debian 8"
692688
download 'https://packages.sury.org/php/apt.gpg'

0 commit comments

Comments
 (0)