Added a check in Makefile to see if composer is installed

Fix #2498

diff --git a/Makefile b/Makefile
index 1df4d6327333a06ef399778f16810f413c6e2f24..83c5f37ad78610d12e49211d3f6c0fc1b8bb752f 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,6 @@ travis: ## Make some stuff for Travis-CI
 deploy: ## Deploy wallabag
        @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

diff --git a/scripts/install.sh b/scripts/install.sh
index 54d0bb785b62976109f5b3e98c5da7c8e92e200d..d7b05a1ec2eb17c6fdec148158dd37abed7dbbc0 100644 (file)
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -2,6 +2,8 @@
 # You can execute this file to install wallabag
 # 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
 TAG=$(git describe --tags $(git rev-list --tags --max-count=1))