From 9998c725330b4a99d6d12df60ac8234052e80b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 27 Oct 2016 09:53:09 +0200
Subject: Added require.sh to check if composer is installed

---
 scripts/install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts/install.sh')

diff --git a/scripts/install.sh b/scripts/install.sh
index d7b05a1e..cf966a0d 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -2,7 +2,9 @@
 # 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; }
+DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+. "$DIR/require.sh"
 
 ENV=$1
 TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
-- 
cgit v1.2.3


From c4d9a8d6d0db2be5c502e257bbeb963e3870d521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 27 Oct 2016 10:09:43 +0200
Subject: Usage of composer.phar if it's found

---
 scripts/install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts/install.sh')

diff --git a/scripts/install.sh b/scripts/install.sh
index cf966a0d..7a1f02bd 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`
 
+COMPOSER_COMMAND='composer'
+
 DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
 . "$DIR/require.sh"
@@ -10,5 +12,5 @@ ENV=$1
 TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
 
 git checkout $TAG
-SYMFONY_ENV=$ENV composer install --no-dev -o --prefer-dist
+SYMFONY_ENV=$ENV $COMPOSER_COMMAND install --no-dev -o --prefer-dist
 php bin/console wallabag:install --env=$ENV
-- 
cgit v1.2.3