getPkgDir impl

nim-lang · Apr 16, 2019 · 51d03b3 · 51d03b3
1 parent 7d0a40a
commit 51d03b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/nimblepkg/nimscriptapi.nim b/src/nimblepkg/nimscriptapi.nim
@@ -146,9 +146,7 @@ template after*(action: untyped, body: untyped): untyped =
   if astToStr(action) & "After" in params:
     retVal = `action After`()
 
-template builtin = discard
-
-proc getPkgDir*(): string =
+proc getPkgDir(): string =
   ## Returns the package directory containing the .nimble file currently
   ## being evaluated.
-  builtin
+  result = currentSourcePath.rsplit(seps={'/', '\\', ':'}, maxsplit=1)[0]
diff --git a/src/nimblepkg/nimscriptwrapper.nim b/src/nimblepkg/nimscriptwrapper.nim
@@ -52,7 +52,7 @@ proc setupNimscript*(scriptName: string, options: Options): tuple[nimsFile, iniF
     if exitCode == 0 and output.len != 0:
       result.iniFile.writeFile(output)
     else:
-      raise newException(NimbleError, "printPkgInfo() failed")
+      raise newException(NimbleError, output & "\nprintPkgInfo() failed")
 
 proc execScript*(scriptName, actionName: string, options: Options): ExecutionResult[bool] =
   let