X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Frequire.sh;h=c48ab936870871a2b81fff865db76d21bd0e2405;hb=4d0c632c70ea50d459c3c55ddda2e0f394dd51cb;hp=851d065ddc69d15b7376f34c6ffbfd2d583d6b16;hpb=9998c725330b4a99d6d12df60ac8234052e80b6a;p=github%2Fwallabag%2Fwallabag.git diff --git a/scripts/require.sh b/scripts/require.sh old mode 100644 new mode 100755 index 851d065d..c48ab936 --- a/scripts/require.sh +++ b/scripts/require.sh @@ -3,6 +3,7 @@ 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 - -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; }