diff --git a/lib/Alchemy/Phrasea/Command/Developer/BowerInstall.php b/lib/Alchemy/Phrasea/Command/Developer/BowerInstall.php index 6bac3cca27..f872a67cd7 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/BowerInstall.php +++ b/lib/Alchemy/Phrasea/Command/Developer/BowerInstall.php @@ -58,7 +58,7 @@ class BowerInstall extends Command if ($input->getOption('clear-cache')) { $output->write("Cleaning bower cache... "); $bower->command(array('cache', 'clean')); - $output->writeln("OK"); + $output->writeln("OK"); } $success = false; @@ -66,7 +66,7 @@ class BowerInstall extends Command try { $output->write("Installing assets..."); $grunt->command('install-assets'); - $output->write(" OK"); + $output->write(" OK"); $output->writeln(""); $this->container['console']->get('assets:compile-less')->execute($input, $output); $success = true; diff --git a/lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php b/lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php index c892b4e519..a02c7f4f0b 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php +++ b/lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php @@ -36,7 +36,7 @@ class ComposerInstall extends Command $output->write("Updating composer... "); $composer->command('self-update'); - $output->writeln("OK"); + $output->writeln("OK"); $commands = array('install', '--optimize-autoloader'); if ($input->getOption('prefer-source')) { @@ -47,11 +47,11 @@ class ComposerInstall extends Command if ($input->getOption('no-dev')) { $output->write("Installing dependencies without developer packages "); $composer->command(array_merge($commands, array('--no-dev'))); - $output->writeln("OK"); + $output->writeln("OK"); } else { $output->write("Installing dependencies with developer packages "); $composer->command(array_merge($commands, array('--dev'))); - $output->writeln("OK"); + $output->writeln("OK"); } } catch (ExecutionFailureException $e) { throw new RuntimeException('Unable to install composer dependencies', $e->getCode(), $e); diff --git a/lib/Alchemy/Phrasea/Command/Developer/InstallAll.php b/lib/Alchemy/Phrasea/Command/Developer/InstallAll.php index e57c0c197d..05d1380ac8 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/InstallAll.php +++ b/lib/Alchemy/Phrasea/Command/Developer/InstallAll.php @@ -33,10 +33,9 @@ class InstallAll extends Command { $ret = 0; - $ret += $this->container['console']->get('dependencies:bower')->execute($input, $output); $ret += $this->container['console']->get('dependencies:composer')->execute($input, $output); - $ret += $this->container['console']->get('assets:compile-less')->execute($input, $output); - + $ret += $this->container['console']->get('dependencies:bower')->execute($input, $output); + return min($ret, 255); } } diff --git a/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php b/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php index d4f759b043..41cd31b4b3 100644 --- a/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php +++ b/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php @@ -38,7 +38,8 @@ abstract class AbstractPluginCommand extends Command $this->container['plugins.autoloader-generator']->write($manifests); $output->writeln(" OK"); - $output->writeln('Building LESS assets'); - $this->container['phraseanet.less-builder']->build($this->container['phraseanet.less-mapping.customizable'], $output); + $output->write('Building LESS assets ...'); + $this->container['phraseanet.less-builder']->build($this->container['phraseanet.less-mapping.customizable']); + $output->writeln(" OK"); } }