From: Nicolas LÅ“uillet Date: Mon, 24 Oct 2016 20:28:44 +0000 (+0200) Subject: Added a check in Makefile to see if composer is installed X-Git-Tag: 2.1.3~18^2 X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=c5ad143e750254adb185ab6956dc87d2585ae54d Added a check in Makefile to see if composer is installed Fix #2498 --- diff --git a/Makefile b/Makefile index 1df4d632..83c5f37a 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 54d0bb78..d7b05a1e 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))