diff --git a/CHANGELOG.md b/CHANGELOG.md index 59c3e98..ed661d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - WordOps backup directory creation before upgrade - EasyEngine database sync during migration - command "wo info" +- phpmyadmin install with composer ### v3.9.4 - 2019-03-15 diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index a8943b6..759ec74 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -1034,10 +1034,11 @@ class WOStackController(CementBaseController): WOVariables.wo_php_user, recursive=True) - if os.path.isfile("/tmp/composer-install"): - WOShellExec.cmd_exec(self, "php -q /tmp/composer-install " - "--install-dir=/tmp/") - shutil.move('/tmp/composer.phar', + if any('/tmp/composer-install' == x[1] + for x in packages): + WOShellExec.cmd_exec(self, "php -q /tmp/composer-install " + "--install-dir=/tmp/") + shutil.move('/tmp/composer.phar', '/usr/local/bin/composer') WOFileUtils.chmod(self, "/usr/local/bin/composer", 0o775) WOShellExec.cmd_exec(self, "sudo -u www-data -H composer " @@ -1306,7 +1307,7 @@ class WOStackController(CementBaseController): "phpmyadmin/archive/STABLE.tar.gz", "/tmp/pma.tar.gz", "phpMyAdmin"], ["https://getcomposer.org/installer", - "/tmp/composer-install", "composer"]] + "/tmp/composer-install", "Composer"]] # PHPREDISADMIN if self.app.pargs.phpredisadmin: Log.debug(self, "Setting packages variable for phpRedisAdmin")