From e415fe827a8fa2c61467439e36b8c6b1896ead76 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Sat, 2 May 2020 18:16:26 +0200
Subject: [PATCH] Testing MariaDB on Ubuntu 20.04

---
 install                      | 12 ++++++------
 wo/cli/plugins/stack_pref.py |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/install b/install
index 6de09ee..de8094b 100755
--- a/install
+++ b/install
@@ -419,8 +419,8 @@ wo_install_acme_sh() {
         export LE_WORKING_DIR="/etc/letsencrypt"
         export LE_CONFIG_HOME="/etc/letsencrypt/config"
         /etc/letsencrypt/acme.sh --config-home '/etc/letsencrypt/config' --upgrade --auto-upgrade
-        /etc/letsencrypt/acme.sh --config-home "/etc/letsencrypt/config" --uninstall-cronjob
-        /etc/letsencrypt/acme.sh --config-home "/etc/letsencrypt/config" --install-cronjob
+        /etc/letsencrypt/acme.sh --config-home '/etc/letsencrypt/config' --uninstall-cronjob
+        /etc/letsencrypt/acme.sh --config-home '/etc/letsencrypt/config' --install-cronjob
     fi
 
 }
@@ -429,13 +429,12 @@ wo_install_acme_sh() {
 wo_install() {
     local python_ver
     python_ver=$(python3 -c "import sys; print(sys.version_info[1])")
-    cd /usr/local/lib/python3."$python_ver"/dist-packages || exit 1
-    rm -f /usr/local/bin/wo
+    if [ -d /usr/local/lib/python3."$python_ver"/dist-packages ]; then
+        cd /usr/local/lib/python3."$python_ver"/dist-packages || exit 1
+    fi
     if [ "$wo_branch" = "master" ]; then
-        python3 -m pip uninstall wo -y
         python3 -m pip install -I wordops
     else
-        python3 -m pip uninstall wo -y
         python3 -m pip install -I "git+git://github.com/WordOps/WordOps.git@$wo_branch#egg=wordops"
     fi
     cp -rf /usr/local/lib/python3."$python_ver"/dist-packages/usr/* /usr/
@@ -445,6 +444,7 @@ wo_install() {
 
 # Clone Github repository if it doesn't exist
 wo_travis_install() {
+    local python_ver
     python_ver=$(python3 -c "import sys; print(sys.version_info[1])")
     if [ -d ./dist ]; then
         rm -rf dist
diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py
index 0cb01d9..ba9cf77 100644
--- a/wo/cli/plugins/stack_pref.py
+++ b/wo/cli/plugins/stack_pref.py
@@ -29,7 +29,7 @@ def pre_pref(self, apt_packages):
 
     if ("mariadb-server" in apt_packages or "mariadb-client" in apt_packages):
         # add mariadb repository excepted on raspbian and ubuntu 19.04
-        if (not WOVar.wo_distro == 'raspbian'):
+        if ((not WOVar.wo_distro == 'raspbian') and (not WOVar.wo_platform_codename == 'focal')):
             Log.info(self, "Adding repository for MySQL, please wait...")
             mysql_pref = (
                 "Package: *\nPin: origin mariadb.mirrors.ovh.net"