devol/wallabag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Usage of composer.phar if it's found

Browse Source
This commit is contained in:
Nicolas Lœuillet 2016-10-27 10:09:43 +02:00
parent 9998c72533
commit c4d9a8d6d0
No known key found for this signature in database
GPG Key ID: BDC1EFB5CA0145F2
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/dev.sh
View File

@ -2,10 +2,12 @@
# You can execute this file to install wallabag dev environment # You can execute this file to install wallabag dev environment
# eg: `sh dev.sh` # eg: `sh dev.sh`
COMPOSER_COMMAND='composer'
DIR="${BASH_SOURCE%/*}" DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
. "$DIR/require.sh" . "$DIR/require.sh"
composer install $COMPOSER_COMMAND install
php bin/console wallabag:install php bin/console wallabag:install
php bin/console server:run php bin/console server:run

4
scripts/install.sh
View File

@ -2,6 +2,8 @@
# You can execute this file to install wallabag # You can execute this file to install wallabag
# eg: `sh install.sh prod` # eg: `sh install.sh prod`
COMPOSER_COMMAND='composer'
DIR="${BASH_SOURCE%/*}" DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
. "$DIR/require.sh" . "$DIR/require.sh"
@ -10,5 +12,5 @@ ENV=$1
TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
git checkout $TAG 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 php bin/console wallabag:install --env=$ENV

5
scripts/require.sh
View File

@ -3,6 +3,7 @@
if [ ! -f composer.phar ]; then if [ ! -f composer.phar ]; then
echo "composer.phar not found, we'll see if composer is installed globally." 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 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; }

4
scripts/update.sh
View File

@ -2,6 +2,8 @@
# You can execute this file to update wallabag # You can execute this file to update wallabag
# eg: `sh update.sh prod` # eg: `sh update.sh prod`
COMPOSER_COMMAND='composer'
DIR="${BASH_SOURCE%/*}" DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
. "$DIR/require.sh" . "$DIR/require.sh"
@ -13,5 +15,5 @@ rm -rf var/cache/*
git fetch origin git fetch origin
git fetch --tags git fetch --tags
git checkout $TAG --force 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 php bin/console cache:clear --env=$ENV