aboutsummaryrefslogtreecommitdiffhomepage
path: root/install.sh
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2016-10-03 15:33:08 +0200
committerGitHub <noreply@github.com>2016-10-03 15:33:08 +0200
commit24add95e9eaa1211655aff6d3d06c30e94252bcc (patch)
tree59fde27b0ec839434b725a276743027672efefd1 /install.sh
parent9d3603147b0a4219a8065861351439cbe5e52772 (diff)
parent88d8125a5fa3b5c6c91cb22fc2bef1243d7391fc (diff)
downloadwallabag-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.sh')
-rwxr-xr-xinstall.sh24
1 files changed, 11 insertions, 13 deletions
diff --git a/install.sh b/install.sh
index 29b343b2..87d53bf0 100755
--- a/install.sh
+++ b/install.sh
@@ -1,15 +1,13 @@
1#! /usr/bin/env bash 1#! /usr/bin/env bash
2 2
3if [[ $ASSETS == 'build' ]]; then 3echo " > Installing PHP dependencies through Composer..."
4 echo "Installing PHP dependencies through Composer..." 4composer install --no-interaction --no-progress --prefer-dist -o --no-dev
5 composer install --no-interaction --no-progress --prefer-dist -o 5
6 6chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm
7 chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm 7echo " > Downloading librairies through npm..."
8 echo "Downloading librairies through npm..." 8vendor/mouf/nodejs-installer/bin/local/npm install
9 vendor/mouf/nodejs-installer/bin/local/npm install 9
10 10echo " > Concat, minify and installing assets..."
11 echo "Concat, minify and installing assets..." 11node_modules/grunt/bin/grunt
12 node_modules/grunt/bin/grunt 12
13else 13echo " > Install finished"
14 composer install --no-interaction --no-progress --prefer-dist -o
15fi