summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xprovisioning/modules/pixelated/files/activate_custom_node_modules.sh9
-rwxr-xr-xservice/go2
2 files changed, 3 insertions, 8 deletions
diff --git a/provisioning/modules/pixelated/files/activate_custom_node_modules.sh b/provisioning/modules/pixelated/files/activate_custom_node_modules.sh
index 5b4ced5f..a8104857 100755
--- a/provisioning/modules/pixelated/files/activate_custom_node_modules.sh
+++ b/provisioning/modules/pixelated/files/activate_custom_node_modules.sh
@@ -25,17 +25,10 @@ if [ ! -e $VAGRANT_NODE_MODULES ] ; then
ln -s $CUSTOM_NODE_MODULES_LOCATION $VAGRANT_NODE_MODULES
fi
-
source /home/vagrant/user-agent-venv/bin/activate
cd /vagrant/service
-echo "running python setup.py develop"
-python setup.py develop >/dev/null
-echo "running bower install"
-cd /vagrant/web-ui/
-bower install >/dev/null
-echo "running go build"
-./go build
+./go setup
cd /vagrant
diff --git a/service/go b/service/go
index d23adf4f..196841ba 100755
--- a/service/go
+++ b/service/go
@@ -19,6 +19,8 @@ function setuppy {
function setupjs {
cd ../web-ui
+ npm install
+ node_modules/bower/bin/bower install --config.interactive=false --allow-root
LC_ALL=en_US.UTF-8 ./go build
cd -
}