aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-10-27 07:30:50 +0200
committerGitHub <noreply@github.com>2016-10-27 07:30:50 +0200
commitf3b637fbfee2fa9f66e53cbadd05e85771eece9d (patch)
tree755d5a262961f494ccb56583a52b9ae2f0fc4ee3
parenta5d6a7d8b5662539e82352b959a28531e5535721 (diff)
parentc5ad143e750254adb185ab6956dc87d2585ae54d (diff)
downloadwallabag-f3b637fbfee2fa9f66e53cbadd05e85771eece9d.tar.gz
wallabag-f3b637fbfee2fa9f66e53cbadd05e85771eece9d.tar.zst
wallabag-f3b637fbfee2fa9f66e53cbadd05e85771eece9d.zip
Merge pull request #2500 from wallabag/add-check-composer
Added a check in Makefile to see if composer is installed
-rwxr-xr-xMakefile2
-rw-r--r--scripts/install.sh2
2 files changed, 3 insertions, 1 deletions
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
41deploy: ## Deploy wallabag 41deploy: ## 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
5command -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
5ENV=$1 7ENV=$1
6TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) 8TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
7 9