From 1bf5b97c79b0301bae7016367a3072babe3125fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Wed, 21 Oct 2015 14:59:27 +0200
Subject: [PATCH] Update build.cmd and build.sh

---
 build.cmd | 24 ++++++++++++++++++------
 build.sh  |  7 +++----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/build.cmd b/build.cmd
index 47d18adb..c7c34ce2 100644
--- a/build.cmd
+++ b/build.cmd
@@ -3,6 +3,8 @@ cd %~dp0
 
 SETLOCAL
 SET CACHED_NUGET="%LocalAppData%\NuGet\NuGet.exe"
+SET BUILDCMD_KOREBUILD_VERSION=""
+SET BUILDCMD_DNX_VERSION=""
 
 IF EXIST %CACHED_NUGET% goto copynuget
 echo Downloading latest version of NuGet.exe...
@@ -16,11 +18,21 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul
 
 :restore
 IF EXIST packages\KoreBuild goto run
-.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
-.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
-CALL packages\KoreBuild\build\dnvm upgrade -runtime clr -arch x86
-CALL packages\KoreBuild\build\dnvm install default -runtime clr -arch x86
+IF %BUILDCMD_KOREBUILD_VERSION%=="" (
+	.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
+) ELSE (
+	.nuget\NuGet.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
+)
+.nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
+
+IF "%SKIP_DNX_INSTALL%"=="1" goto run
+IF %BUILDCMD_DNX_VERSION%=="" (
+	CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
+) ELSE (
+	CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -a default
+)
+CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
 
 :run
-CALL packages\KoreBuild\build\dnvm use default -runtime clr -arch x86
-packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -I build -f makefile.shade %*
\ No newline at end of file
+CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
+packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
\ No newline at end of file
diff --git a/build.sh b/build.sh
index d8116435..fae169ec 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if test `uname` = Darwin; then
     cachedir=~/Library/Caches/KBuild
@@ -24,7 +24,7 @@ fi
 
 if test ! -d packages/KoreBuild; then
     mono .nuget/nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
-    mono .nuget/nuget.exe install Sake -version 0.2 -o packages -ExcludeVersion
+    mono .nuget/nuget.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
 fi
 
 if ! type dnvm > /dev/null 2>&1; then
@@ -35,5 +35,4 @@ if ! type dnx > /dev/null 2>&1; then
     dnvm upgrade
 fi
 
-mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"
-
+mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"
\ No newline at end of file