Remove the composer.phar distribution and check env for COMPOSER path
This commit is contained in:
parent
b7770e5709
commit
cb93cdbb27
@ -31,7 +31,7 @@ if [ "$TRAVIS" = "true" ]; then
|
||||
|
||||
# clear any app specific stuff that might have been loaded in
|
||||
find storage/app/public -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
|
||||
find storage/app -mindepth 1 -not -name '.gitignore' -not -name public -print0 -exec rm -rf {} +
|
||||
find storage/app -mindepth 1 -not -name '.gitignore' -not -name public -print0 -exec rm -rf {} +
|
||||
|
||||
# Remove any development files
|
||||
rm -rf .sass-cache
|
||||
@ -41,6 +41,7 @@ if [ "$TRAVIS" = "true" ]; then
|
||||
# remove large sized files
|
||||
rm -rf .git
|
||||
rm -rf node_modules
|
||||
rm -rf composer.phar
|
||||
|
||||
# delete files in vendor that are rather large
|
||||
rm -rf vendor/willdurand/geocoder/tests
|
||||
|
9
Makefile
9
Makefile
@ -3,6 +3,7 @@
|
||||
# Create the phpvms database if needed:
|
||||
# docker exec phpvms /usr/bin/mysql -uroot -e 'CREATE DATABASE phpvms'
|
||||
SHELL := /bin/bash
|
||||
COMPOSER ?= composer
|
||||
|
||||
PKG_NAME := "/tmp"
|
||||
CURR_PATH=$(shell pwd)
|
||||
@ -30,7 +31,7 @@ clean-routes:
|
||||
|
||||
.PHONY: build
|
||||
build:
|
||||
@php composer.phar install --no-interaction
|
||||
@php $(COMPOSER) install --no-interaction
|
||||
|
||||
# This is to build all the stylesheets, etc
|
||||
.PHONY: build-assets
|
||||
@ -46,14 +47,14 @@ install: build
|
||||
|
||||
.PHONY: update
|
||||
update: build
|
||||
@php composer.phar dump-autoload
|
||||
@php composer.phar update --no-interaction
|
||||
@php $(COMPOSER) dump-autoload
|
||||
@php $(COMPOSER) update --no-interaction
|
||||
@php artisan migrate --force
|
||||
@echo "Done!"
|
||||
|
||||
.PHONY: reset
|
||||
reset: clean
|
||||
@php composer.phar dump-autoload
|
||||
@php $(COMPOSER) dump-autoload
|
||||
@make reload-db
|
||||
|
||||
.PHONY: reload-db
|
||||
|
@ -25,6 +25,13 @@ php artisan migrate:refresh --seed
|
||||
|
||||
then point your webserver to the `/public` folder.
|
||||
|
||||
By default, the Makefile calls the system-wide `composer`. If your host requires a
|
||||
certain path or name for composer, add `COMPOSER=` to the front of the `make` command, e.g:
|
||||
|
||||
```bash
|
||||
COMPOSER=composer.phar make install
|
||||
```
|
||||
|
||||
## development environment
|
||||
|
||||
For development, copy the included `env.php.example` to `env.php` file. By default, it uses sqlite
|
||||
|
BIN
composer.phar
BIN
composer.phar
Binary file not shown.
Loading…
Reference in New Issue
Block a user