--- 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
--- a/cms/app-client/package.json Thu Nov 03 01:52:26 2016 +0100
+++ b/cms/app-client/package.json Thu Nov 03 03:05:43 2016 +0100
@@ -1,6 +1,6 @@
{
"name": "app-client",
- "version": "0.0.4",
+ "version": "0.0.5",
"description": "Small description for app-client goes here",
"private": true,
"directories": {
--- a/cms/package.json Thu Nov 03 01:52:26 2016 +0100
+++ b/cms/package.json Thu Nov 03 03:05:43 2016 +0100
@@ -1,6 +1,6 @@
{
"name": "corpus-cms",
- "version": "0.0.4",
+ "version": "0.0.5",
"description": "drupal module to embed the Ember app \"app-client\"",
"scripts": {
"build": "npm run build --prefix app-client/ && gulp copy-module",
--- a/server/bo_client/package.json Thu Nov 03 01:52:26 2016 +0100
+++ b/server/bo_client/package.json Thu Nov 03 03:05:43 2016 +0100
@@ -1,6 +1,6 @@
{
"name": "bo-client",
- "version": "0.0.4",
+ "version": "0.0.5",
"description": "Bo client for Corpus Parole",
"private": true,
"directories": {
--- a/server/src/config/version.php Thu Nov 03 01:52:26 2016 +0100
+++ b/server/src/config/version.php Thu Nov 03 03:05:43 2016 +0100
@@ -8,5 +8,5 @@
| Must be incremented as needed.
|
*/
- 'version' => '0.0.4'
+ 'version' => '0.0.5'
];