From: Fernando Monserrat <fernando.monserrat@gmail.com>
Date: Wed, 30 May 2018 18:53:19 +0000 (-0300)
Subject: 13544: fix fpm command
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d42466273a43e23c6731af81ead835377c7da10e?ds=sidebyside

13544: fix fpm command
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>
---

diff --git a/run-tests-build.sh b/run-tests-build.sh
index 57a70f65a9..a98f346724 100755
--- a/run-tests-build.sh
+++ b/run-tests-build.sh
@@ -49,11 +49,12 @@ rm -Rf $WORKDIR/node_modules
 rm -f $WORKDIR/*.deb; rm -f $WORKDIR/*.rpm
 # run test and build dist 
 make test
-make build
+#make build
+yarn build
 
 # Build deb and rpm packages using fpm from dist passing the destination folder for the deploy to be /var/www/arvados-workbench2/
-fpm -s dir -t deb  -n arvados-workbench2 -v "$build_version" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" --config-files /etc/arvados/workbench2/workbench2.yml --deb-no-default-config-files $WORKDIR/dist/=/var/www/arvados-workbench2/ $WORKDIR/workbench2.yml=/etc/arvados/workbench2/workbench2.yml
-fpm -s dir -t rpm  -n arvados-workbench2 -v "$build_version" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" --config-files /etc/arvados/workbench2/workbench2.yml $WORKDIR/dist/=/var/www/arvados-workbench2/workbench2/ $WORKDIR/workbench2.yml=/etc/arvados/workbench2/workbench2.yml
+fpm -s dir -t deb  -n arvados-workbench2 -v "$build_version" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" --deb-no-default-config-files $WORKDIR/build/=/var/www/arvados-workbench2/
+fpm -s dir -t rpm  -n arvados-workbench2 -v "$build_version" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" $WORKDIR/build/=/var/www/arvados-workbench2/workbench2/
 
 mkdir $WORKDIR/packages
 mkdir $WORKDIR/packages/centos7