From c5ad143e750254adb185ab6956dc87d2585ae54d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 24 Oct 2016 22:28:44 +0200 Subject: [PATCH] Added a check in Makefile to see if composer is installed Fix #2498 --- Makefile | 2 +- scripts/install.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1df4d6327..83c5f37ad 100755 --- 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 54d0bb785..d7b05a1ec 100644 --- 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))