Merge 4af0a46 into 2dc713a

jshint · Jan 23, 2015 · a1d74d0 · a1d74d0
2 parents 2dc713a + 4af0a46
commit a1d74d0
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/cli.js b/src/cli.js
@@ -74,19 +74,19 @@ function deprecated(text, alt) {
 function findConfig(file) {
   var dir  = path.dirname(path.resolve(file));
   var envs = getHomeDir();
-
-  if (!envs)
-    return home;
-
-  var home = path.normalize(path.join(envs, ".jshintrc"));
-
   var proj = findFile(".jshintrc", dir);
+  var home;
+
   if (proj)
     return proj;
-
-  if (shjs.test("-e", home))
-    return home;
-
+
+  else if (envs) {
+    home = path.normalize(path.join(envs, ".jshintrc"));
+
+    if (shjs.test("-e", home))
+      return home;
+  }
+
   return null;
 }