Merge pull request #427 from bluecherrydvr/groovy-support

Add Ubuntu Groovy support
bluecherrydvr · Apr 30, 2021 · 1ed7bc4 · 1ed7bc4
2 parents bd5d94f + 1f80927
commit 1ed7bc4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/debian/control.in b/debian/control.in
@@ -33,6 +33,7 @@ Depends: ${shlibs:Depends}, ssl-cert, ucf, curl, sysstat,
 #wily    php5-sqlite, libapache2-mod-php5, php5-gd, php5-curl, php5-mysqlnd
 #wheezy  php5-sqlite, libapache2-mod-php5, php5-gd, php5-curl, php5-mysqlnd
 #jessie  php5-sqlite, libapache2-mod-php5, php5-gd, php5-curl, php5-mysqlnd
+#groovy libapache2-mod-php7.4, mariadb-server, php-mysql, php-curl, php-gd, php-sqlite3
 Recommends: mysql-server
 Suggests: monit, mail-transport-agent
 Conflicts: solo6010-dkms

diff --git a/misc/postinstall.sh b/misc/postinstall.sh
@@ -128,7 +128,7 @@ case "$1" in
 			elif [[ "$UBUNTU_CODENAME" == 'bionic' ]]
 			then
 				a2enmod php7.2
-			elif [[ "$UBUNTU_CODENAME" == 'focal' ]]
+			elif [[ "$UBUNTU_CODENAME" == 'focal' || "$UBUNTU_CODENAME" == 'groovy' ]]
 			then
 				a2enmod php7.4
 			elif [[ "$VERSION" == "10 (buster)" ]]