Merge pull request #2279 from wallabag/cleanup-travis

Check if asset is enable instead of opposite

1 files changed, 4 insertions, 15 deletions

diff --git a/install.sh b/install.sh
index 414f73f2..a486e8a5 100755
--- a/install.sh
+++ b/install.sh
@@ -1,15 +1,8 @@
 #! /usr/bin/env bash
 
-if [[ $ASSETS == 'nobuild' ]]; then
-    composer install --no-interaction --no-progress --prefer-dist -o
-else
-
+if [[ $ASSETS == 'build' ]]; then
     echo "Installing PHP dependencies through Composer..."
-    if [[ $ASSETS == 'build' ]]; then
-        composer install --no-interaction --no-progress --prefer-dist -o
-    else
-        SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
-    fi
+    composer install --no-interaction --no-progress --prefer-dist -o
 
     chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm
     echo "Downloading javascript librairies through npm..."
@@ -20,10 +13,6 @@ else
 
     echo "Concat, minify and installing assets..."
     node_modules/grunt/bin/grunt
-
-    if [[ $ASSETS != 'build' ]]; then
-        echo "Installing wallabag..."
-        php bin/console wallabag:install --env=prod
-    fi
-
+else
+    composer install --no-interaction --no-progress --prefer-dist -o
 fi