Skip to content

Commit

Permalink
installer fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ivanproskuryakov committed Sep 4, 2015
1 parent 610b3b1 commit 7f46ea2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#Symfony API
/web/.htaccess
/web/media/product/*
!/web/web/media/product/.htaccess
/web/media/product/*/*
/web/web/media/product/.htaccess
/web/css/*
/web/bundles/*
/app/bootstrap.php.cache
Expand Down
14 changes: 4 additions & 10 deletions src/Aisel/ResourceBundle/Command/InstallCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,9 @@ protected function launchSetup(InputInterface $input, OutputInterface $output)
*/
protected function setupDatabase(InputInterface $input, OutputInterface $output)
{
$drop = $this->getApplication()->find('doctrine:database:drop');
$drop_args = array(
'command' => 'doctrine:database:drop',
'--force' => true
);
$drop->run(new ArrayInput($drop_args), $output);
$this->runCommand('doctrine:database:create', $input, $output);
$this->runCommand('doctrine:schema:create', $input, $output);
$this->runCommand('doctrine:fixtures:load', $input, $output);
$this->runCommand('doctrine:mongodb:schema:drop', $input, $output);
$this->runCommand('doctrine:mongodb:schema:create', $input, $output);
$this->runCommand('doctrine:mongodb:fixtures:load', $input, $output);
}

/**
Expand Down Expand Up @@ -177,7 +171,7 @@ private static function commandExists($command)
{
$installedCommand = "command -v $command";

return (bool) shell_exec($installedCommand);
return (bool)shell_exec($installedCommand);
}

}

0 comments on commit 7f46ea2

Please sign in to comment.