Move interactivity check to after we've determined there's no source …

…file
JuliaLang · May 9, 2017 · fc32f8a · fc32f8a
1 parent 602dc5a
commit fc32f8a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/base/loading.jl b/base/loading.jl
@@ -519,7 +519,11 @@ end
 function source_dir()
     isinteractive() && return pwd()
     p = source_path(nothing)
-    p === nothing ? p : dirname(p)
+    if p === nothing
+        isinteractive() ? pwd() : p
+    else
+        dirname(p)
+    end
 end
 
 """