diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-10-24 22:28:44 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-10-24 22:28:44 +0200 |
commit | c5ad143e750254adb185ab6956dc87d2585ae54d (patch) | |
tree | 4606aae38ca12b292f9655bef1090a47fe8a4ddc | |
parent | 1172622a071ad6766ce95acab103893a348f1dd9 (diff) | |
download | wallabag-c5ad143e750254adb185ab6956dc87d2585ae54d.tar.gz wallabag-c5ad143e750254adb185ab6956dc87d2585ae54d.tar.zst wallabag-c5ad143e750254adb185ab6956dc87d2585ae54d.zip |
Added a check in Makefile to see if composer is installed
Fix #2498
-rwxr-xr-x | Makefile | 2 | ||||
-rw-r--r-- | scripts/install.sh | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -41,6 +41,6 @@ travis: ## Make some stuff for Travis-CI | |||
41 | deploy: ## Deploy wallabag | 41 | deploy: ## Deploy wallabag |
42 | @bundle exec cap staging deploy | 42 | @bundle exec cap staging deploy |
43 | 43 | ||
44 | .PHONY: help clean install update build test release travis deploy | 44 | .PHONY: help clean install update build test release travis deploy run dev |
45 | 45 | ||
46 | .DEFAULT_GOAL := install | 46 | .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 @@ | |||
2 | # You can execute this file to install wallabag | 2 | # You can execute this file to install wallabag |
3 | # eg: `sh install.sh prod` | 3 | # eg: `sh install.sh prod` |
4 | 4 | ||
5 | 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; } | ||
6 | |||
5 | ENV=$1 | 7 | ENV=$1 |
6 | TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) | 8 | TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) |
7 | 9 | ||