From 4f175749e4308f2636596d9bcaae1f11ba672bc7 Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Wed, 4 Jan 2017 16:05:43 +0000
Subject: [PATCH] Don't search for nimscriptapi overrides. Fixes #306.

---
 src/nimblepkg/nimscriptsupport.nim | 32 ++++++------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/nimblepkg/nimscriptsupport.nim b/src/nimblepkg/nimscriptsupport.nim
index 3121e5b..86fde03 100644
--- a/src/nimblepkg/nimscriptsupport.nim
+++ b/src/nimblepkg/nimscriptsupport.nim
@@ -182,22 +182,6 @@ proc setupVM(module: PSym; scriptName: string,
     if not flags.isNil:
       flags[a.getString 0] = a.getString 1
 
-proc findNimscriptApi(options: Options): string =
-  ## Returns the directory containing ``nimscriptapi.nim`` or an empty string
-  ## if it cannot be found.
-  result = ""
-  # Try finding it in exe's path
-  if fileExists(getAppDir() / "nimblepkg" / "nimscriptapi.nim"):
-    result = getAppDir()
-
-  if result.len == 0:
-    let pkgs = getInstalledPkgsMin(options.getPkgsDir(), options)
-    var pkg: PackageInfo
-    if pkgs.findPkg(("nimble", newVRAny()), pkg):
-      let pkgDir = pkg.getRealDir()
-      if fileExists(pkgDir / "nimblepkg" / "nimscriptapi.nim"):
-        result = pkgDir
-
 proc getNimPrefixDir(): string = splitPath(findExe("nim")).head.parentDir
 
 when declared(ModuleGraph):
@@ -222,16 +206,12 @@ proc execScript(scriptName: string, flags: StringTableRef,
   let pkgName = scriptName.splitFile.name
 
   # Ensure that "nimblepkg/nimscriptapi" is in the PATH.
-  let nimscriptApiPath = findNimscriptApi(options)
-  if nimscriptApiPath.len > 0:
-    # TODO: Once better output is implemented show a message here.
-    appendStr(searchPaths, nimscriptApiPath)
-  else:
-    let tmpNimscriptApiPath = getTempDir() / "nimblepkg" / "nimscriptapi.nim"
-    createDir(tmpNimscriptApiPath.splitFile.dir)
-    if not existsFile(tmpNimscriptApiPath):
-      writeFile(tmpNimscriptApiPath, nimscriptApi)
-    appendStr(searchPaths, getTempDir())
+  # TODO: put this in a more isolated directory.
+  let tmpNimscriptApiPath = getTempDir() / "nimblepkg" / "nimscriptapi.nim"
+  createDir(tmpNimscriptApiPath.splitFile.dir)
+  if not existsFile(tmpNimscriptApiPath):
+    writeFile(tmpNimscriptApiPath, nimscriptApi)
+  appendStr(searchPaths, getTempDir())
 
   initDefines()
   loadConfigs(DefaultConfig)