--- a/build/build.sh Tue Jul 11 09:49:26 2017 +0200
+++ b/build/build.sh Fri Sep 08 12:04:06 2017 +0200
@@ -20,7 +20,8 @@
echoblue "---> preparing bo client"
pushd ../server/bo_client > /dev/null
- /usr/local/bin/npm install
+ rm -fr node_modules bower_components
+ yarn install --ignore-engines
./node_modules/.bin/bower install
popd > /dev/null
echoblue "---> preparing bo client done"
@@ -35,7 +36,8 @@
echoblue "---> preparing app-client"
pushd ../cms/app-client > /dev/null
- /usr/local/bin/npm install
+ rm -fr node_modules bower_components
+ yarn install --ignore-engines
./node_modules/.bin/bower install
popd > /dev/null
echoblue "---> preparing app-client done"
@@ -132,17 +134,19 @@
echoblue "---> building app-client"
pushd ../cms/app-client > /dev/null
-npm install
+yarn install --ignore-engines
./node_modules/.bin/bower install
./node_modules/.bin/ember build ${build_option}
popd > /dev/null
echoblue "---> building app-client done"
-echoblue "---> building module"
+echoblue "---> building module and copying front"
pushd ../cms > /dev/null
npm install
+./node_modules/.bin/gulp copy-drupal ${build_option} --version="$version"
./node_modules/.bin/gulp copy-build ${build_option} --version="$version"
popd > /dev/null
+echoblue "---> building module and copying front done"
echoblue "---> building package"
vagrant ssh -c "/vagrant/build_rpm.sh"
@@ -158,6 +162,13 @@
echoblue "--> archiving dist"
+pushd "$DIR" > /dev/null
+
+cp drupal/installDrupal.sh dist/
+cp drupal/exportDrupal.sh dist/
+
+popd > /dev/null
+
pushd "$DIR/dist" > /dev/null
if [ -f bootstrap-puppet.sh -a -f corpusdelaparole-$version-*.noarch.rpm -a -f installDrupal.sh -a -f puppet-corpusdelaparole-$version-*.noarch.rpm ]; then
@@ -166,7 +177,7 @@
mkdir "$ARCHIVE_NAME"
- cp bootstrap-puppet.sh corpusdelaparole-$version-*.noarch.rpm installDrupal.sh puppet-corpusdelaparole-$version-*.noarch.rpm "$ARCHIVE_NAME"
+ cp bootstrap-puppet.sh corpusdelaparole-$version-*.noarch.rpm installDrupal.sh exportDrupal.sh puppet-corpusdelaparole-$version-*.noarch.rpm "$ARCHIVE_NAME"
tar zcvf "${ARCHIVE_NAME}.tar.gz" "$ARCHIVE_NAME"