tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cli/setup: Do not return false; after $this->fail() 

$this-fail() throws an exception.
This commit is contained in:
Eric Lippmann 2014-12-30 15:54:07 +01:00
parent 9de1b20d3c
commit f9ca0296a4
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/setup/application/clicommands/ConfigCommand.php
View File

@ -60,20 +60,23 @@ class ConfigCommand extends Command
));
}
if (false === mkdir($configDir)) {
$this->fail(sprintf($this->translate('Unable to create path: %s'), $configDir));
return false;
if (! mkdir($configDir)) {
$this->fail(sprintf($this->translate('Can\'t create configuration directory %s'), $configDir));
}
if (! chmod($configDir, octdec($mode))) {
$this->fail($this->translate(
'Unable to change the mode of the configuration directory'
$this->fail(sprintf(
$this->translate('Can\'t change the mode of the configuration directory to %s'),
$mode
));
}
if (chgrp($configDir, $group) === false) {
$this->fail(sprintf($this->translate('Unable to change the group of "%s" to "%s".'), $configDir, $group));
return false;
if (! chgrp($configDir, $group)) {
$this->fail(sprintf(
$this->translate('Can\'t change the to change the group of %s to %s'),
$configDir,
$group
));
}
printf($this->translate("Successfully created configuration directory at: %s\n"), $configDir);