From 436b7c6e93f95601006a8bb7e545a5760466320a Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Wed, 28 Sep 2016 23:30:09 +0200
Subject: [PATCH] HotFix: Support spaces in binary paths for doCmdEx.

---
 src/nimblepkg/tools.nim | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/nimblepkg/tools.nim b/src/nimblepkg/tools.nim
index 369fa66..7e2989f 100644
--- a/src/nimblepkg/tools.nim
+++ b/src/nimblepkg/tools.nim
@@ -2,11 +2,17 @@
 # BSD License. Look at license.txt for more info.
 #
 # Various miscellaneous utility functions reside here.
-import osproc, pegs, strutils, os, uri, sets, json
+import osproc, pegs, strutils, os, uri, sets, json, parseutils
 import version, packageinfo, nimbletypes
 
+proc extractBin(cmd: string): string =
+  if cmd[0] == '"':
+    return cmd.captureBetween('"')
+  else:
+    return cmd.split(' ')[0]
+
 proc doCmd*(cmd: string) =
-  let bin = cmd.split(' ')[0]
+  let bin = extractBin(cmd)
   if findExe(bin) == "":
     raise newException(NimbleError, "'" & bin & "' not in PATH.")
 
@@ -21,7 +27,7 @@ proc doCmd*(cmd: string) =
         "Execution failed with exit code " & $exitCode)
 
 proc doCmdEx*(cmd: string): tuple[output: TaintedString, exitCode: int] =
-  let bin = cmd.split(' ')[0]
+  let bin = extractBin(cmd)
   if findExe(bin) == "":
     raise newException(NimbleError, "'" & bin & "' not in PATH.")
   return execCmdEx(cmd)
@@ -41,7 +47,7 @@ proc getNimBin*: string =
 
 proc getNimrodVersion*: Version =
   let nimBin = getNimBin()
-  let vOutput = doCmdEx(nimBin & " -v").output
+  let vOutput = doCmdEx('"' & nimBin & "\" -v").output
   var matches: array[0..MaxSubpatterns, string]
   if vOutput.find(peg"'Version'\s{(\d+\.)+\d}", matches) == -1:
     quit("Couldn't find Nim version.", QuitFailure)