diff --git a/scripts/dev.sh b/scripts/dev.sh index 9b89da35f..fa3b2d5d5 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` +# 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 diff --git a/scripts/install.sh b/scripts/install.sh index d7b05a1ec..7a1f02bd8 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -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 diff --git a/scripts/require.sh b/scripts/require.sh new file mode 100644 index 000000000..ddfb3dd2a --- /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 b920a829b..45e93f363 100644 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -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