From 383e4fd7bc0c9182d6b89b8ec2fb7c2183431dbd Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Wed, 21 Feb 2018 19:06:42 +0000
Subject: [PATCH] Merges #450 manually with some adjustments.

---
 src/nimblepkg/options.nim | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/nimblepkg/options.nim b/src/nimblepkg/options.nim
index b220b42..b1591b0 100644
--- a/src/nimblepkg/options.nim
+++ b/src/nimblepkg/options.nim
@@ -221,11 +221,17 @@ proc renameBabelToNimble(options: Options) {.deprecated.} =
       removeFile(nimbleDir / "babeldata.json")
 
 proc getNimbleDir*(options: Options): string =
-  result =
-    if options.nimbleDir.len == 0:
-      options.config.nimbleDir
-    else:
-      options.nimbleDir
+  result = options.config.nimbleDir
+  if options.nimbleDir.len != 0:
+    # --nimbleDir:<dir> takes priority...
+    result = options.nimbleDir
+  else:
+    # ...followed by the environment variable.
+    let env = getEnv("NIMBLE_DIR")
+    if env.len != 0:
+      display("Warning:", "Using the environment variable: NIMBLE_DIR='" &
+                        env & "'", Warning)
+      result = env
 
   return expandTilde(result)
 
@@ -319,7 +325,7 @@ proc parseFlag*(flag, val: string, result: var Options, kind = cmdLongOption) =
 proc initOptions*(): Options =
   result.action.typ = actionNil
   result.pkgInfoCache = newTable[string, PackageInfo]()
-  result.nimbleDir = getEnv("NIMBLE_DIR")
+  result.nimbleDir = ""
   result.verbosity = HighPriority
 
 proc parseMisc(options: var Options) =
@@ -366,11 +372,6 @@ proc parseCmdLine*(): Options =
   if result.action.typ == actionNil and not result.showVersion:
     result.showHelp = true
 
-  # Inform user that we use their environment variables.
-  if result.getNimbleDir == getEnv("NIMBLE_DIR"):
-    display("Info:", "Using the 'NIMBLE_DIR' environment variable.",
-            priority = HighPriority)
-
 proc getProxy*(options: Options): Proxy =
   ## Returns ``nil`` if no proxy is specified.
   var url = ""