diff --git a/README.md b/README.md index f42c9ae..56e244d 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ Installation * Run `make migrate` to set up the database +* Run `bin/console salt:org:add` to create your first organisation + * Run `bin/console salt:user:add` to create your first user * Get IP address of web container using diff --git a/bin/console b/bin/console index 34e07b5..e66dc9e 100755 --- a/bin/console +++ b/bin/console @@ -1,11 +1,5 @@ #!/bin/bash -DIR=$(dirname $0) +cd $(dirname $0) -which docker >/dev/null 2>&1 - -if [ $? -eq 0 ]; then - exec $DIR/console-docker "$@" -else - exec $DIR/console-real "$@" -fi +./phpcli ./bin/console-real "$@" diff --git a/bin/console-docker b/bin/console-docker deleted file mode 100755 index e66dc9e..0000000 --- a/bin/console-docker +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -cd $(dirname $0) - -./phpcli ./bin/console-real "$@" diff --git a/bin/console-real b/bin/console-real deleted file mode 100755 index de592ad..0000000 --- a/bin/console-real +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env php -')) { -# echo "PHP 7 is required\n"; -# exit; -#} - -/** - * @var Composer\Autoload\ClassLoader $loader - */ -$loader = require __DIR__.'/../app/autoload.php'; - -$input = new ArgvInput(); -$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); -$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; - -if ($debug) { - Debug::enable(); -} - -$kernel = new AppKernel($env, $debug); -$application = new Application($kernel); -$application->run($input);