FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove bootstrap cache (#448)

Browse Source 
* Cleanup the bootstrap/cache directory when packaging

* Fix removal of bootstrap cache

* Formatting
This commit is contained in:
Nabeel S 2019-12-02 10:29:16 -05:00 committed by GitHub
parent 68eff40753
commit 83821d1e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 202 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis/deploy_script.sh
View File

@ -91,6 +91,7 @@ if [ "$TRAVIS" = "true" ]; then
find . -type d -name "sass-cache" -print0 | xargs rm -rf find . -type d -name "sass-cache" -print0 | xargs rm -rf
# clear any app specific stuff that might have been loaded in # clear any app specific stuff that might have been loaded in
find bootstrap/cache -mindepth 1 -maxdepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
find storage/app -mindepth 1 -maxdepth 1 -not -name '.gitignore' -not -name public -not -name import -print0 -exec rm -rf {} + find storage/app -mindepth 1 -maxdepth 1 -not -name '.gitignore' -not -name public -not -name import -print0 -exec rm -rf {} +
find storage/app/public -mindepth 1 -maxdepth 1 -not -name '.gitignore' -not -name avatars -not -name uploads -print0 -exec rm -rf {} + find storage/app/public -mindepth 1 -maxdepth 1 -not -name '.gitignore' -not -name avatars -not -name uploads -print0 -exec rm -rf {} +
find storage/app/public/avatars -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} + find storage/app/public/avatars -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +

7
app/Providers/AppServiceProvider.php
View File

@ -25,7 +25,6 @@ use App\Models\Subfleet;
use App\Models\User; use App\Models\User;
use App\Repositories\SettingRepository; use App\Repositories\SettingRepository;
use App\Services\ModuleService; use App\Services\ModuleService;
use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\View; use Illuminate\Support\Facades\View;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
@ -70,8 +69,10 @@ class AppServiceProvider extends ServiceProvider
// Only load the IDE helper if it's included and enabled // Only load the IDE helper if it's included and enabled
if (config('app.debug_toolbar') === true) { if (config('app.debug_toolbar') === true) {
/* @noinspection NestedPositiveIfStatementsInspection */ /* @noinspection NestedPositiveIfStatementsInspection */
if (class_exists(IdeHelperServiceProvider::class)) { /* @noinspection PhpFullyQualifiedNameUsageInspection */
$this->app->register(IdeHelperServiceProvider::class); if (class_exists(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class)) {
/* @noinspection PhpFullyQualifiedNameUsageInspection */
$this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
} }
} }
} }

386
composer.lock generated
View File

File diff suppressed because it is too large Load Diff