diff --git a/app/Console/Commands/Install.php b/app/Console/Commands/Install.php index 4381f87..f048fd7 100644 --- a/app/Console/Commands/Install.php +++ b/app/Console/Commands/Install.php @@ -66,9 +66,7 @@ class Install extends Command try { - $composer->mustRun(); - $progress->advance(); - + $npm->mustRun(); $progress->advance(); @@ -140,7 +138,7 @@ class Install extends Command $this->call('config:cache'); touch($basePath . '/INSTALLED'); - + $this->call('up'); $this->info('>> All done! Visit ' . $baseURL . ' to start using your brand new installation of Raspberry Teams!'); diff --git a/install.sh b/install.sh index 60046d8..56cc55e 100644 --- a/install.sh +++ b/install.sh @@ -1,32 +1,8 @@ #!/usr/bin/env bash -echo "[!! Welcome! The application will now run through all necessary steps to make sure everything works. !!]" - -echo ">> Installing PHP dependencies..." +echo "Preliminary installation starting!" +sleep 3 composer install -echo ">> Installing Javascript dependencies..." -npm install - -echo ">> Building scripts..." -npm run dev - -echo ">> Configuring Homestead database..."; -cp .env.example .env - -echo ">> Generating secure application key..." -php artisan key:generate - -sed -i 's/laravel/homestead/g' .env -sed -i 's/root/homestead/g' .env -sed -i 's/password/secret/g' .env - -echo "!! Warning! Many other options, such as Recaptcha, IP location, and email sending have not been configured automatically. " - -echo ">> Running migrations..." -php artisan migrate -php artisan db:seed - -php artisan config:cache - -echo "Enjoy! Install finished." +echo "Full installation starting!" +php artisan application:install