--- a/build/build.sh	Thu Nov 03 01:52:26 2016 +0100
+++ b/build/build.sh	Thu Nov 03 03:05:43 2016 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -l
 
 set -e
 ## option --prod/--dev
@@ -43,24 +43,26 @@
     echoblue "---> preparing module"
     pushd ../cms
     npm install
+    popd
+    echoblue "---> preparing module done"
 
 
     echoblue "---> checking vagrant"
-    if vagrant status | grep -q "running"; then
+    if vagrant status | grep -q -v "running"; then
         echoblue "---> starting vagrant"
-        if [ type workon ]; then
+        if type -t workon > /dev/null 2>&1; then
             workon ansible
         fi
         vagrant up
         VAGRANT_STARTED=true
-        if [ type deactivate ]; then
+        if type -t deactivate > /dev/null 2>&1; then
             deactivate
         fi
     fi
 
     echoblue "---> done"
 
-    popd
+    popd > /dev/null
 
 }
 
@@ -115,13 +117,13 @@
 mkdir -p root/var/www/corpusdelaparole/corpus-back
 mkdir -p root/var/www/corpusdelaparole/drupal/sites/all/modules
 
-echoblue "---> buiding back"
+echoblue "---> building back"
 pushd ../server/src
 version=$(sed -n "s/[[:space:]]*\'version\'[[:space:]]*=>[[:space:]]*\'\([\.0-9]*\)\'/\1/p" config/version.php)
 version=${version:-0.0.0}
 ./node_modules/.bin/gulp copy-build ${build_option_back}
 popd
-echoblue "---> buiding back done"
+echoblue "---> building back done"
 
 echoblue "---> building app-client"
 pushd ../cms/app-client
@@ -136,7 +138,15 @@
 
 echoblue "---> building package"
 vagrant ssh -c "/vagrant/build_rpm.sh"
+echoblue "---> building package done"
+
+if [ "$VAGRANT_STARTED" = true ]; then
+    echoblue "---> Stopping vagrant"
+    vagrant halt
+    echoblue "---> Stopping vagrant done"
+fi
+
+popd > /dev/null
 
 echoblue "---> done"
 
-popd