From 2eda5b64f2116eca618cb577a079aad61da5d20f Mon Sep 17 00:00:00 2001
From: Tulio Casagrande <tcasagra@thoughtworks.com>
Date: Fri, 13 Jan 2017 14:03:16 -0200
Subject: Fix js setup for vagrant

---
 Makefile             | 3 ++-
 install-pixelated.sh | 4 ++--
 web-ui/package.json  | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index ec865cf5..d031ceb3 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,8 @@ install_py: service/requirements.txt service/test_requirements.txt
 requirements_js:
 	@echo "Installing javascript npm and bower dependencies"
 	@cd web-ui;\
-	npm install
+	npm install;\
+	node_modules/.bin/bower install
 
 .PHONY: install_js
 install_js:
diff --git a/install-pixelated.sh b/install-pixelated.sh
index e3f4aaf1..26836b38 100755
--- a/install-pixelated.sh
+++ b/install-pixelated.sh
@@ -113,14 +113,14 @@ node_modules/bower/bin/bower -V install --config.interactive=false --allow-root
 LC_ALL=en_US.UTF-8 ./go build
 
 # install service dependencies
-cd ../service
+cd ..
 rm -rf "$VIRTUALENV_PATH"
 virtualenv "$VIRTUALENV_PATH"
 source "$VIRTUALENV_PATH/bin/activate"
 # they can't be on the same command because it breaks pip upgrade
 pip install --upgrade pip
 pip install --upgrade setuptools
-./go setup --always-unzip
+make setup
 pip uninstall -y enum34 && pip install enum34
 pip uninstall -y pysqlcipher && pip install pysqlcipher # this is needed so pysqlcipher gets recompiled with the right version of glibc
 
diff --git a/web-ui/package.json b/web-ui/package.json
index d67114cc..3d1720e1 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -62,7 +62,6 @@
     "clean": "rm -rf dist/ app/js/generated/hbs/* app/css/*",
     "package": "PIXELATED_BUILD='package' npm run build-prod && npm run imagemin",
     "imagemin": "node config/imagemin.js",
-    "add_git_version": "/bin/bash config/add_git_version.sh",
-    "postinstall" : "bower install"
+    "add_git_version": "/bin/bash config/add_git_version.sh"
   }
 }
-- 
cgit v1.2.3