remove install scripts and tweak travis

3 files changed, 3 insertions, 29 deletions

diff --git a/.travis.yml b/.travis.yml
index b0b26b56..9973bcae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,8 +91,9 @@ before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
-    - travis_wait bash install_dev.sh
+    - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
     - ant prepare-$DB
-    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi;
+    - if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; then phpunit -v ; fi;
     - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
     - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
+    - if [[ $ASSETS = build ]]; then node_modules/grunt-cli/bin/grunt ; fi;
diff --git a/install.sh b/install.sh
deleted file mode 100755
index fad8b4c0..00000000
--- a/install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /usr/bin/env bash
-
-echo " > Installing PHP dependencies through Composer..."
-SYMFONY_ENV=prod composer install --no-interaction --no-progress --prefer-dist -o --no-dev
-
-chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm
-echo " > Downloading librairies through npm..."
-vendor/mouf/nodejs-installer/bin/local/npm install
-
-echo " > Concat, minify and installing assets..."
-node_modules/grunt/bin/grunt
-
-echo " > Install finished"
diff --git a/install_dev.sh b/install_dev.sh
deleted file mode 100755
index cbd47495..00000000
--- a/install_dev.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /usr/bin/env bash
-
-echo " > Installing PHP dependencies (including dev) through Composer..."
-composer install -o  --no-interaction --no-progress --prefer-dist
-
-if [[ $ASSETS == 'build' || $TRAVIS_BUILD_DIR == '' ]]; then
-    echo " > Downloading librairies through npm..."
-    npm install
-
-    echo " > Concat, minify and installing assets..."
-    grunt
-fi
-
-echo " > Install finished"