diff --git a/install b/install index d0d2de2..08452d3 100755 --- a/install +++ b/install @@ -147,9 +147,9 @@ if [ -z "$wo_force_install" ]; then wo_lib_echo_fail "other Linux distributions and perhaps even Unix deratives." exit 100 else - check_wo_linux_distro=$(lsb_release -sc | grep -E "trusty|xenial|bionic|disco|jessie|stretch|buster") + check_wo_linux_distro=$(lsb_release -sc | grep -E "xenial|bionic|disco|jessie|stretch|buster") if [ -z "$check_wo_linux_distro" ]; then - wo_lib_echo_fail "WordOps (wo) only supports Ubuntu 14.04/16.04/18.04/19.04 LTS, Debian 8.x/9.x/10.x and Raspbian 9.x" + wo_lib_echo_fail "WordOps (wo) only supports Ubuntu 16.04/18.04/19.04 LTS, Debian 9.x/10.x and Raspbian 9.x" exit 100 fi fi diff --git a/wo/cli/plugins/stack_upgrade.py b/wo/cli/plugins/stack_upgrade.py index 0344c09..5af52b8 100644 --- a/wo/cli/plugins/stack_upgrade.py +++ b/wo/cli/plugins/stack_upgrade.py @@ -1,17 +1,19 @@ -from cement.core.controller import CementBaseController, expose -from cement.core import handler, hook -from wo.core.logging import Log -from wo.core.variables import WOVariables -from wo.core.aptget import WOAptGet -from wo.core.apt_repo import WORepo -from wo.core.services import WOService -from wo.core.fileutils import WOFileUtils -from wo.core.shellexec import WOShellExec -from wo.core.extract import WOExtract -from wo.core.download import WODownload import os import shutil +from cement.core import handler, hook +from cement.core.controller import CementBaseController, expose +from wo.cli.plugins.stack import WOStackController +from wo.core.apt_repo import WORepo +from wo.core.aptget import WOAptGet +from wo.core.download import WODownload +from wo.core.extract import WOExtract +from wo.core.fileutils import WOFileUtils +from wo.core.logging import Log +from wo.core.services import WOService +from wo.core.shellexec import WOShellExec +from wo.core.variables import WOVariables + class WOStackUpgradeController(CementBaseController): class Meta: @@ -83,6 +85,9 @@ class WOStackUpgradeController(CementBaseController): # All package update apt_packages = [] packages = [] + empty_packages = [] + stack = WOStackController() + stack.app = self.app if ((not self.app.pargs.web) and (not self.app.pargs.nginx) and (not self.app.pargs.php) and (not self.app.pargs.mysql) and @@ -187,7 +192,7 @@ class WOStackUpgradeController(CementBaseController): WOAptGet.update(self) # Update packages WOAptGet.install(self, apt_packages) - + stack.post_pref(apt_packages, empty_packages) # Post Actions after package updates if (set(WOVariables.wo_nginx).issubset(set(apt_packages))): WOService.restart_service(self, 'nginx')