From 77d97f66f3c73c39809d01b5ce41c0aa5cbd59ca Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Sun, 18 Oct 2015 23:35:43 -0700
Subject: [PATCH] Fixed the *nix build

---
 build.sh          | 5 -----
 scripts/bootstrap | 8 ++++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index c76023c84..bbfbf299b 100755
--- a/build.sh
+++ b/build.sh
@@ -1,8 +1,3 @@
 #!/usr/bin/env bash
 
-if ! type dnvm > /dev/null 2>&1; then
-    curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | DNX_BRANCH=dev sh && source ~/.dnx/dnvm/dnvm.sh
-fi
-
-# bootstrap!
 ./scripts/bootstrap
\ No newline at end of file
diff --git a/scripts/bootstrap b/scripts/bootstrap
index 4558931d6..122cf2857 100755
--- a/scripts/bootstrap
+++ b/scripts/bootstrap
@@ -34,11 +34,15 @@ STAGE0_PUBLISH=$REPOROOT/scripts/stage0/dotnet-publish
 export DOTNET_CLR_HOSTS_PATH=$REPOROOT/ext/CLRHost/$RID
 export DOTNET_CSC_PATH=$REPOROOT/src/cscthingy/bin/Debug/dnxcore50/publish
 
+if ! type dnvm > /dev/null 2>&1; then
+    curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | DNX_BRANCH=dev sh && source ~/.dnx/dnvm/dnvm.sh
+fi
+
 echo "Installing and use-ing the latest CoreCLR x64 DNX ..."
-call dnvm install latest -u -r coreclr -alias dotnet_bootstrap
+dnvm install latest -u -r coreclr -alias dotnet_bootstrap
 rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
 
-call dnvm use dotnet_bootstrap -r coreclr -arch x64
+dnvm use dotnet_bootstrap -r coreclr -arch x64
 rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
 
 type -p dnx >/dev/null