Merge branch 'master' into nimscript-support

readme.markdown

@@ -57,9 +57,9 @@ On Windows installing Nimble from source is slightly more complex:
 
     git clone https://github.com/nim-lang/nimble.git
     cd nimble
-    nim c src\nimble
-    cp src\nimble.exe src\nimble1.exe
-    src\nimble1.exe install
+    nim c src/nimble
+    cp src/nimble.exe src/nimble1.exe
+    src/nimble1.exe install
 
 This is required because Windows will lock the process which is being run and
 during installation Nimble will recompile itself.

src/nimblepkg/tools.nim

@@ -36,8 +36,8 @@ template cd*(dir: string, body: stmt) =
 
 proc getNimBin*: string =
   result = "nim"
-  if findExe("nim") != "": result = "nim"
-  elif findExe("nimrod") != "": result = "nimrod"
+  if findExe("nim") != "": result = findExe("nim")
+  elif findExe("nimrod") != "": result = findExe("nimrod")
 
 proc getNimrodVersion*: Version =
   let nimBin = getNimBin()