devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-16 18:30:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2500 from wallabag/add-check-composer

Browse Source 
Added a check in Makefile to see if composer is installed
This commit is contained in:
Jeremy Benoist 2016-10-27 07:30:50 +02:00 committed by GitHub
commit f3b637fbfe
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -41,6 +41,6 @@ travis: ## Make some stuff for Travis-CI
deploy: ## Deploy wallabag deploy: ## Deploy wallabag
@bundle exec cap staging deploy @bundle exec cap staging deploy
.PHONY: help clean install update build test release travis deploy .PHONY: help clean install update build test release travis deploy run dev
.DEFAULT_GOAL := install .DEFAULT_GOAL := install

2
scripts/install.sh
View File

@ -2,6 +2,8 @@
# You can execute this file to install wallabag # You can execute this file to install wallabag
# eg: `sh install.sh prod` # eg: `sh install.sh prod`
command -v composer >/dev/null 2>&1 || { echo >&2 "wallabag requires composer but it's not installed (see http://doc.wallabag.org/en/master/user/installation.html). Aborting."; exit 1; }
ENV=$1 ENV=$1
TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) TAG=$(git describe --tags $(git rev-list --tags --max-count=1))