Commit 3922cb52 authored by Thomas Gambier's avatar Thomas Gambier

slapos_web_deploy: support Ubuntu 19.10

parent d3b935fc
Pipeline #7531 failed with stage
in 0 seconds
......@@ -40,7 +40,7 @@ fi
# Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``export FORCE=yes``
if [[ ! ${DISTRO} =~ (jessie|stretch|buster|xenial|artful|bionic|rhel7|LinuxMint-17.2|f20|f19|f26) ]]; then
if [[ ! ${DISTRO} =~ (jessie|stretch|buster|xenial|artful|bionic|eoan|rhel7|LinuxMint-17.2|f20|f19|f26) ]]; then
echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
......@@ -126,11 +126,11 @@ is_package_installed unzip || install_package unzip
is_package_installed openssl || install_package openssl
is_package_installed ansible || install_package ansible
if is_ubuntu && [[ $DISTRO == "buster" || $DISTRO == "Raspbian-10." ]]; then
if ! is_ubuntu || [[ $DISTRO = wheezy || $DISTRO == jessie || $DISTRO == stretch || $DISTRO = xenial || $DISTRO = artful || $DISTRO = bionic ]]; then
is_package_installed python-pip || install_package python-pip
else
# Ansible is using python3 now
is_package_installed python3-pip || install_package python3-pip
else
is_package_installed python-pip || install_package python-pip
fi
if is_fedora && [[ $DISTRO == "f26" ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment