diff --git a/lib/general b/lib/general index d0184f3..97ecd9b 100644 --- a/lib/general +++ b/lib/general @@ -102,7 +102,7 @@ db_delete() { check_osname() { local distr=`echo $(lsb_release -i | cut -d':' -f 2)` local osver=`echo $(lsb_release -c | cut -d':' -f 2)` - if ! [[ $distr == "Ubuntu" && $osver =~ ^(trusty|xenial|zesty|artful)$ ]]; then + if ! [[ $distr == "Ubuntu" && $osver =~ ^(trusty|xenial|zesty|artful|bionic)$ ]]; then echo "${red}" >&2 echo "****************************************************************************" >&2 echo "**** This OS is not supported by Webinoly and could not work properly ****" >&2 @@ -134,7 +134,7 @@ mysql_client_install() { sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db sudo add-apt-repository "deb [arch=amd64,i386,ppc64el] http://mirrors.syringanetworks.net/mariadb/repo/10.2/ubuntu $osname main" ;; - "xenial"|"zesty"|"artful") + "xenial"|"zesty"|"artful"|"bionic") sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 sudo add-apt-repository "deb [arch=amd64,i386,ppc64el] http://mirrors.syringanetworks.net/mariadb/repo/10.2/ubuntu $osname main" ;; diff --git a/plugins/stack b/plugins/stack index eefdf99..3fda788 100644 --- a/plugins/stack +++ b/plugins/stack @@ -196,8 +196,10 @@ elif [[ $arg == "-purge" && $opt == "-mysql" ]]; then conf_delete delautopma fi sudo service mysql stop - sudo apt-get -y purge mariadb-server mariadb-common mysql-common debconf-utils + echo "mariadb-server-10.2 mariadb-server-10.2/postrm_remove_databases boolean true" | debconf-set-selections + sudo apt-get -y purge mariadb-server mariadb-common mysql-common sudo apt-get -y purge mariadb-client + sudo apt-get -y purge debconf-utils sudo apt-get -y autoremove os_name=$(check_osname) @@ -207,7 +209,7 @@ elif [[ $arg == "-purge" && $opt == "-mysql" ]]; then "trusty") sudo apt-key del 0xcbcb082a1bb943db ;; - "xenial"|"zesty"|"artful") + "xenial"|"zesty"|"artful"|"bionic") sudo apt-key del 0xF1656F24C74CD1D8 ;; esac diff --git a/weby b/weby index 994e304..797a99f 100644 --- a/weby +++ b/weby @@ -1,13 +1,13 @@ #!/bin/bash # Webinoly Installation Script. -webyversion="1.4.2-beta" +webyversion="1.4.2" # Check OS support distr=`echo $(lsb_release -i | cut -d':' -f 2)` osver=`echo $(lsb_release -c | cut -d':' -f 2)` -if ! [[ $distr == "Ubuntu" && $osver =~ ^(xenial)$ ]]; then +if ! [[ $distr == "Ubuntu" && $osver =~ ^(xenial|bionic)$ ]]; then echo "$(tput setaf 1)" echo "****************************************************************************" echo "**** This OS is not supported by Webinoly and could not work properly ****"