Merge pull request #2507 from wallabag/add-check-makefile

Added require.sh to check if composer is installed
This commit is contained in:
Nicolas Lœuillet 2016-10-27 13:55:17 +02:00 committed by GitHub
commit 069d39dfaf
4 changed files with 31 additions and 6 deletions

View file

@ -1,7 +1,13 @@
#! /usr/bin/env bash
# You can execute this file to install wallabag dev environmnet
# eg: `sh install.sh prod`
# 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"; fi
. "$DIR/require.sh"
$COMPOSER_COMMAND install
php bin/console wallabag:install
php bin/console server:run

View file

@ -2,11 +2,15 @@
# 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; }
COMPOSER_COMMAND='composer'
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))
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

9
scripts/require.sh Normal file
View file

@ -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

View file

@ -2,6 +2,12 @@
# 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"; 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