diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-10-03 15:33:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 15:33:08 +0200 |
commit | 24add95e9eaa1211655aff6d3d06c30e94252bcc (patch) | |
tree | 59fde27b0ec839434b725a276743027672efefd1 /install_dev.sh | |
parent | 9d3603147b0a4219a8065861351439cbe5e52772 (diff) | |
parent | 88d8125a5fa3b5c6c91cb22fc2bef1243d7391fc (diff) | |
download | wallabag-24add95e9eaa1211655aff6d3d06c30e94252bcc.tar.gz wallabag-24add95e9eaa1211655aff6d3d06c30e94252bcc.tar.zst wallabag-24add95e9eaa1211655aff6d3d06c30e94252bcc.zip |
Merge pull request #2338 from wallabag/install-2.1
Fix for 2.1 installation
Diffstat (limited to 'install_dev.sh')
-rwxr-xr-x | install_dev.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/install_dev.sh b/install_dev.sh index 61a4f6fd..cbd47495 100755 --- a/install_dev.sh +++ b/install_dev.sh | |||
@@ -1,13 +1,14 @@ | |||
1 | #! /usr/bin/env bash | 1 | #! /usr/bin/env bash |
2 | 2 | ||
3 | echo "Installing PHP dependencies (including dev) through Composer..." | 3 | echo " > Installing PHP dependencies (including dev) through Composer..." |
4 | composer install | 4 | composer install -o --no-interaction --no-progress --prefer-dist |
5 | 5 | ||
6 | echo "Downloading librairies through npm..." | 6 | if [[ $ASSETS == 'build' || $TRAVIS_BUILD_DIR == '' ]]; then |
7 | npm install | 7 | echo " > Downloading librairies through npm..." |
8 | npm install | ||
8 | 9 | ||
9 | echo "Concat, minify and installing assets..." | 10 | echo " > Concat, minify and installing assets..." |
10 | grunt | 11 | grunt |
12 | fi | ||
11 | 13 | ||
12 | echo "Installing wallabag..." | 14 | echo " > Install finished" |
13 | php bin/console wallabag:install | ||