From d6222035ef4ce7d54a931d647980d79b2c74ec18 Mon Sep 17 00:00:00 2001 From: Bubka <858858+Bubka@users.noreply.github.com> Date: Thu, 31 Mar 2022 12:40:14 +0200 Subject: [PATCH] Revert changes to composer.json scripts section This reverts commits: 1a68a8e91aca60447e7b930b31c6e46be4f7d719 a8614f4aa0fa88b754f06be4dc87c254067c2003 --- .travis.yml | 3 ++- README.md | 5 +++-- composer.json | 16 ++++------------ 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d61de03..ee38925f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,10 @@ php: - 8.0 before_script: + - cp .env.travis .env - travis_retry composer self-update - travis_retry composer install --no-interaction - - cp .env.travis .env + - php artisan key:generate - nvm install node --lts - npm install npm@latest -g - npm install diff --git a/README.md b/README.md index 67a0db78..9948e5e6 100644 --- a/README.md +++ b/README.md @@ -95,14 +95,15 @@ ### Set up your database ### Set your variables -In your installation directory, edit the `.env` file and adapt the settings to your running environment (see instructions in the file). -If the file is missing simply make a copy of the `.env.example` file and rename the copy `.env`. +In your installation directory make a copy of the `.env.example` file and rename the copy `.env`. +Edit the `.env` file and adapt the settings to your running environment (see instructions in the file) ### Prepare some stuff ```sh php artisan migrate:refresh php artisan passport:install +php artisan storage:link php artisan config:cache ``` diff --git a/composer.json b/composer.json index fd462092..33ba7a1d 100644 --- a/composer.json +++ b/composer.json @@ -59,19 +59,11 @@ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "@php artisan package:discover --ansi" ], - "pre-install-cmd": [ - + "post-root-package-install": [ + "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], - "post-install-cmd": [ - "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"", - "@php artisan key:generate", - "@php artisan storage:link" - ], - "pre-update-cmd": [ - - ], - "post-update-cmd": [ - "@php artisan cache:clear" + "post-create-project-cmd": [ + "@php artisan key:generate --ansi" ], "test" : [ "vendor/bin/phpunit"