From 54907ddb1e159cbe198797885019e4e390a251af Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Sat, 7 Apr 2018 12:33:23 +0200
Subject: tools: improve demo_setup.sh

1. Account for the fact that go can be already in path.
2. Unset GOROOT in case it is set already.
3. export variables (not sure how it worked for me).
---
 tools/demo_setup.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/demo_setup.sh b/tools/demo_setup.sh
index f3e683dc5..f93897d31 100755
--- a/tools/demo_setup.sh
+++ b/tools/demo_setup.sh
@@ -21,10 +21,11 @@
 
 set -eux
 
-DIR=$PWD
-PATH=$PATH:$DIR/go/bin
-GOPATH=$DIR/gopath
-NVM=$(((`free -g | grep "Mem:" | awk '{print $2}'`-1)/3))
+export DIR=$PWD
+export PATH=$DIR/go/bin:$PATH
+export GOPATH=$DIR/gopath
+export GOROOT=
+export NVM=$(((`free -g | grep "Mem:" | awk '{print $2}'`-1)/3))
 
 sudo apt-get install -y -q make git curl bison flex bc libssl-dev gcc g++ qemu-system-x86
 
-- 
cgit mrf-deployment