From 722dd721b04eddaa4606cd4d885e5896dad67836 Mon Sep 17 00:00:00 2001
From: Charles Stoner <chucks@microsoft.com>
Date: Fri, 13 Nov 2015 13:32:21 -0800
Subject: [PATCH] Add Microsoft.DotNet.Tools.Repl* to install

---
 debian_config.json            | 2 ++
 scripts/build/build-stage.ps1 | 3 +++
 scripts/build/build-stage.sh  | 3 +++
 scripts/install.ps1           | 4 ++--
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian_config.json b/debian_config.json
index 3cc322128..c9b2ce0f3 100644
--- a/debian_config.json
+++ b/debian_config.json
@@ -36,6 +36,8 @@
         "dotnet-compile" : "usr/bin/dotnet-compile",
         "dotnet-compile-csc" : "usr/bin/dotnet-compile-csc",
         "dotnet-publish" : "usr/bin/dotnet-publish",
+        "dotnet-repl" : "usr/bin/dotnet-repl",
+        "dotnet-repl-csi" : "usr/bin/dotnet-repl-csi",
         "dotnet-restore" : "usr/bin/dotnet-restore",
         "resgen" : "usr/bin/resgen"
     }
diff --git a/scripts/build/build-stage.ps1 b/scripts/build/build-stage.ps1
index 285eb0ed5..894da4319 100644
--- a/scripts/build/build-stage.ps1
+++ b/scripts/build/build-stage.ps1
@@ -17,11 +17,14 @@ $Projects = @(
     "Microsoft.DotNet.Tools.Compiler.Csc",
     "Microsoft.DotNet.Tools.Pack",
     "Microsoft.DotNet.Tools.Publish",
+    "Microsoft.DotNet.Tools.Repl",
+    "Microsoft.DotNet.Tools.Repl.Csi",
     "Microsoft.DotNet.Tools.Resgen",
     "Microsoft.DotNet.Tools.Run"
 )
 
 $BinariesForCoreHost = @(
+    "csi"
     "csc"
     "vbc"
 )
diff --git a/scripts/build/build-stage.sh b/scripts/build/build-stage.sh
index 25b1dadbb..c3cc7b8fc 100755
--- a/scripts/build/build-stage.sh
+++ b/scripts/build/build-stage.sh
@@ -29,11 +29,14 @@ PROJECTS=( \
     Microsoft.DotNet.Tools.Compiler.Csc \
     Microsoft.DotNet.Tools.Publish \
     Microsoft.DotNet.Tools.Pack \
+    Microsoft.DotNet.Tools.Repl \
+    Microsoft.DotNet.Tools.Repl.Csi \
     Microsoft.DotNet.Tools.Resgen \
     Microsoft.DotNet.Tools.Run \
 )
 
 BINARIES_FOR_COREHOST=( \
+    csi \
     csc \
     vbc \
 )
diff --git a/scripts/install.ps1 b/scripts/install.ps1
index 7e483939b..8c187ba5a 100644
--- a/scripts/install.ps1
+++ b/scripts/install.ps1
@@ -75,8 +75,8 @@ Add-Type -Assembly System.IO.Compression.FileSystem | Out-Null
 [System.IO.Compression.ZipFile]::ExtractToDirectory("$InstallDir\$DotNetFileName", "$InstallDir\cli_new")
 
 # Replace the old installation (if any)
-if (Test-Path "$InstallPath\cli") {
-    del -rec -for "$InstallPath\cli"
+if (Test-Path "$InstallDir\cli") {
+    del -rec -for "$InstallDir\cli"
 }
 mv "$InstallDir\cli_new" "$InstallDir\cli"