Merge remote-tracking branch 'origin/master' into 2.2

4 files changed, 35 insertions, 8 deletions

diff --git a/scripts/dev.sh b/scripts/dev.sh
index 9b89da35..0703ced1 100644
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
@@ -1,7 +1,13 @@
-#! /usr/bin/env bash
-# You can execute this file to install wallabag dev environmnet
-# eg: `sh install.sh prod`
+#!/usr/bin/env bash
+# You can execute this file to install wallabag dev environment
+# eg: `sh dev.sh`
 
-composer install
+COMPOSER_COMMAND='composer'
+
+DIR="${BASH_SOURCE}"
+if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
+. "$DIR/require.sh"
+
+$COMPOSER_COMMAND install
 php bin/console wallabag:install
 php bin/console server:run
diff --git a/scripts/install.sh b/scripts/install.sh
index 54d0bb78..62a46f4f 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -1,10 +1,16 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 # 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/scripts"; fi
+. "$DIR/require.sh"
+
 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
diff --git a/scripts/require.sh b/scripts/require.sh
new file mode 100644
index 00000000..ddfb3dd2
--- /dev/null
+++ b/scripts/require.sh
@@ -0,0 +1,9 @@
+#! /usr/bin/env bash
+# File used to check dependencies
+
+if [ ! -f composer.phar ]; then
+    echo "composer.phar not found, we'll see if composer is installed globally."
+    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; }
+else
+    COMPOSER_COMMAND='composer.phar'
+fi
diff --git a/scripts/update.sh b/scripts/update.sh
index b920a829..f43c4f24 100644
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -1,7 +1,13 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 # You can execute this file to update wallabag
 # eg: `sh update.sh prod`
 
+COMPOSER_COMMAND='composer'
+
+DIR="${BASH_SOURCE}"
+if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
+. "$DIR/require.sh"
+
 ENV=$1
 TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
 
@@ -9,5 +15,5 @@ rm -rf var/cache/*
 git fetch origin
 git fetch --tags
 git checkout $TAG --force
-SYMFONY_ENV=$ENV composer install --no-dev -o --prefer-dist
+SYMFONY_ENV=$ENV $COMPOSER_COMMAND install --no-dev -o --prefer-dist
 php bin/console cache:clear --env=$ENV