diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-04-07 12:33:23 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-04-07 12:33:23 +0200 |
| commit | 54907ddb1e159cbe198797885019e4e390a251af (patch) | |
| tree | 1cc8fdc2378491397e549042ac821931f2c816dd /tools | |
| parent | d613535f944822fb93ba6b033f22ede8628275f5 (diff) | |
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).
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/demo_setup.sh | 9 |
1 files changed, 5 insertions, 4 deletions
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 |