From 64d14dbae8a1b9663fa46d4e9b1f0c3f04c0d628 Mon Sep 17 00:00:00 2001 From: jeroenops Date: Wed, 14 Nov 2018 19:26:05 +0100 Subject: [PATCH] Added sendmail dependency --- README.md | 2 ++ install | 4 ++-- wo/core/variables.py | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7c2785a..a36c761 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # [WordOps](https://wordops.org/) +[![Travis Build Status](https://travis-ci.org/WordOps/WordOps.svg)](https://travis-ci.org/WordOps/WordOps) + WordOps (wo) is the essential toolset that eases WordPress site and server administration. **WordOps currently supports:** diff --git a/install b/install index a4ad6b1..d0384a7 100644 --- a/install +++ b/install @@ -86,9 +86,9 @@ fi function wo_install_dep() { if [ "$wo_linux_distro" == "Ubuntu" ]; then - apt-get -y install build-essential curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common || wo_lib_error "There was an error during dependency installation, exit status " 1 + apt-get -y install build-essential curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common sendmail || wo_lib_error "There was an error during dependency installation, exit status " 1 elif [ "$wo_linux_distro" == "Debian" ]; then - apt-get -y install build-essential curl gzip dirmngr python3 python3-apt python3-setuptools python3-dev sqlite3 git tar python-software-properties || wo_lib_error "There was an error during dependency installation, exit status " 1 + apt-get -y install build-essential curl gzip dirmngr python3 python3-apt python3-setuptools python3-dev sqlite3 git tar python-software-properties sendmail || wo_lib_error "There was an error during dependency installation, exit status " 1 fi # Generate the locale, output to the blackhole rather than STDOUT diff --git a/wo/core/variables.py b/wo/core/variables.py index 790bb69..1a63002 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -169,13 +169,12 @@ class WOVariables(): wo_mysql = ["mariadb-server", "percona-toolkit"] # HHVM repo details - # 12.04 requires boot repository if wo_platform_distro == 'ubuntu': if wo_platform_codename == "precise": wo_boost_repo = ("ppa:mapnik/boost") wo_hhvm_repo = ("deb http://dl.hhvm.com/ubuntu {codename} main" .format(codename=wo_platform_codename)) - elif wo_platform_codename == "trusty": + elif wo_platform_codename == "trusty" or wo_platform_codename == "xenial" or wo_platform_codename == "bionic": wo_hhvm_repo = ("deb http://dl.hhvm.com/ubuntu {codename} main" .format(codename=wo_platform_codename)) else: