Merge remote-tracking branch 'gnuio/master' into nightly

This commit is contained in:
Mikael Nordfeldth
2017-12-17 18:32:23 +01:00
5 changed files with 27 additions and 21 deletions

View File

@@ -47,10 +47,10 @@ class CliInstaller extends Installer
*/
function main()
{
if ($this->prepare()) {
if (!$this->checkPrereqs()) {
return false;
}
if ($this->prepare()) {
return $this->handle();
} else {
$this->showHelp();