diff -r a8effb60ccb6 -r 762fc0eb4946 build/build.sh --- a/build/build.sh Sun Dec 04 13:49:44 2016 +0100 +++ b/build/build.sh Fri Dec 09 11:41:15 2016 +0100 @@ -16,34 +16,34 @@ } function install() { - pushd "$DIR" + pushd "$DIR" > /dev/null echoblue "---> preparing bo client" - pushd ../server/bo_client + pushd ../server/bo_client > /dev/null /usr/local/bin/npm install ./node_modules/.bin/bower install - popd + popd > /dev/null echoblue "---> preparing bo client done" echoblue "---> preparing back" - pushd ../server/src + pushd ../server/src > /dev/null php composer.phar install /usr/local/bin/npm install ./node_modules/.bin/bower install - popd + popd > /dev/null echoblue "---> preparing back done" echoblue "---> preparing app-client" - pushd ../cms/app-client + pushd ../cms/app-client > /dev/null /usr/local/bin/npm install ./node_modules/.bin/bower install - popd + popd > /dev/null echoblue "---> preparing app-client done" echoblue "---> preparing module" - pushd ../cms + pushd ../cms > /dev/null npm install - popd + popd > /dev/null echoblue "---> preparing module done" @@ -111,7 +111,7 @@ echo "do_install: $do_install" [[ "$do_install" == true ]] && echoblue "DO INSTALL" && install; -pushd "$DIR" +pushd "$DIR" > /dev/null echoblue "---> cleaning build folder" rm -fr root @@ -121,28 +121,28 @@ mkdir -p root/var/www/corpusdelaparole/drupal/sites/all/modules echoblue "---> building back" -pushd ../server/src +pushd ../server/src > /dev/null version=$(sed -n "s/[[:space:]]*\'version\'[[:space:]]*=>[[:space:]]*\'\([\.0-9]*\)\'/\1/p" config/version.php) version=${version:-0.0.0} npm install ./node_modules/.bin/bower install ./node_modules/.bin/gulp copy-build ${build_option_back} -popd +popd > /dev/null echoblue "---> building back done" echoblue "---> building app-client" -pushd ../cms/app-client +pushd ../cms/app-client > /dev/null npm install ./node_modules/.bin/bower install ./node_modules/.bin/ember build ${build_option} -popd +popd > /dev/null echoblue "---> building app-client done" echoblue "---> building module" -pushd ../cms +pushd ../cms > /dev/null npm install ./node_modules/.bin/gulp copy-build ${build_option} --version="$version" -popd +popd > /dev/null echoblue "---> building package" vagrant ssh -c "/vagrant/build_rpm.sh" @@ -156,5 +156,22 @@ popd > /dev/null +echoblue "--> archiving dist" + +pushd "$DIR/dist" > /dev/null + +rm -f corpusdelaparole-back_*_*.tar.gz +ARCHIVE_NAME="corpusdelaparole-back_$(date +%Y-%m-%d)_${version}" + +mkdir "$ARCHIVE_NAME" + +cp bootstrap-puppet.sh corpusdelaparole-$version-*.noarch.rpm installDrupal.sh puppet-corpusdelaparole-$version-*.noarch.rpm "$ARCHIVE_NAME" + +tar zcvf "${ARCHIVE_NAME}.tar.gz" "$ARCHIVE_NAME" + +rm -fr "$ARCHIVE_NAME" + +popd > /dev/null + echoblue "---> done"