lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Rearrange a few thing

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-05-24 20:03:10 -07:00
parent 8d9cdf9c15
commit 94a337fc9e
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
upgrade.php
View file

@ -365,7 +365,7 @@ echo "--------------------------------------------------------\n";
echo "STEP 8: Updating composer dependencies:\n"; echo "STEP 8: Updating composer dependencies:\n";
echo "(This may take a moment.)\n"; echo "(This may take a moment.)\n";
echo "--------------------------------------------------------\n\n"; echo "--------------------------------------------------------\n\n";
echo "-- Running the app in ".$app_environment." mode.\n";
// Composer install // Composer install
if (file_exists('composer.phar')) { if (file_exists('composer.phar')) {
@ -374,7 +374,7 @@ if (file_exists('composer.phar')) {
$composer_update = shell_exec('php composer.phar self-update'); $composer_update = shell_exec('php composer.phar self-update');
echo $composer_update."\n\n"; echo $composer_update."\n\n";
$composer_dump = shell_exec('php composer.phar dump');
// Use --no-dev only if we are in production mode. // Use --no-dev only if we are in production mode.
// This will cause errors otherwise, if the user is in develop or local for their APP_ENV // This will cause errors otherwise, if the user is in develop or local for their APP_ENV
@ -383,18 +383,23 @@ if (file_exists('composer.phar')) {
} else { } else {
$composer = shell_exec('php composer.phar install --prefer-source'); $composer = shell_exec('php composer.phar install --prefer-source');
} }
$composer_dump = shell_exec('php composer.phar dump');
} else { } else {
echo "-- We couldn't find a local composer.phar. No worries, trying globally.\n\n";
$composer_dump = shell_exec('composer dump');
if ($app_environment == 'production') { if ($app_environment == 'production') {
$composer = shell_exec('composer install --no-dev --prefer-source'); $composer = shell_exec('composer install --no-dev --prefer-source');
} else { } else {
$composer = shell_exec('composer install --prefer-source'); $composer = shell_exec('composer install --prefer-source');
} }
echo "-- We couldn't find a local composer.phar. No worries, trying globally.\n";
$composer_dump = shell_exec('composer dump');
} }
echo $composer_dump."\n"; echo $composer_dump."\n";