From 501aa8363cda95480f6dddeb184765e50ab5d2c7 Mon Sep 17 00:00:00 2001
From: "ASP.NET Push Bot" <noemail@noemail>
Date: Mon, 5 Oct 2015 14:25:55 -0700
Subject: [PATCH] :arrow_up: dnvm.ps1, dnvm.cmd, dnvm.sh

Source: aspnet/dnvm@8aa7b4d4c50e6290900b76f1a0580f651f42ef9f
---
 dnvm.ps1 | 15 +++++++++++----
 dnvm.sh  |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dnvm.ps1 b/dnvm.ps1
index 62f305b695..c0b5611d74 100644
--- a/dnvm.ps1
+++ b/dnvm.ps1
@@ -67,7 +67,7 @@ function _WriteOut {
 
 ### Constants
 $ProductVersion="1.0.0"
-$BuildVersion="rc1-15523"
+$BuildVersion="rc1-15524"
 $Authors="Microsoft Open Technologies, Inc."
 
 # If the Version hasn't been replaced...
@@ -1848,10 +1848,17 @@ if(Test-Path env:\KRE_HOME) {
 
 $cmd = $args[0]
 
+$cmdargs = @()
 if($args.Length -gt 1) {
-    $cmdargs = @($args[1..($args.Length-1)])
-} else {
-    $cmdargs = @()
+    # Combine arguments, ensuring any containing whitespace or parenthesis are correctly quoted 
+    ForEach ($arg In $args[1..($args.Length-1)]) {
+        if ($arg -match "[\s\(\)]") {
+            $cmdargs += """$arg"""
+        } else {
+            $cmdargs += $arg
+        }
+        $cmdargs += " "
+    }
 }
 
 # Can't add this as script-level arguments because they mask '-a' arguments in subcommands!
diff --git a/dnvm.sh b/dnvm.sh
index 02397d2ecc..64c5bec8b4 100644
--- a/dnvm.sh
+++ b/dnvm.sh
@@ -2,7 +2,7 @@
 # Source this file from your .bash-profile or script to use
 
 # "Constants"
-_DNVM_BUILDNUMBER="rc1-15523"
+_DNVM_BUILDNUMBER="rc1-15524"
 _DNVM_AUTHORS="Microsoft Open Technologies, Inc."
 _DNVM_RUNTIME_PACKAGE_NAME="dnx"
 _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment"