add LOAD_PATH. closes #7

JuliaLang · Feb 10, 2012 · 5587896 · 5587896
1 parent db7df14
commit 5587896
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/j/client.j b/j/client.j
@@ -192,6 +192,7 @@ function _start()
         end
 
         global const VARIABLES = {}
+        global const LOAD_PATH = String["", "$JULIA_HOME/", "$JULIA_HOME/j/"]
 
         # Load customized startup
         try include(strcat(getcwd(),"/startup.j")) end

diff --git a/j/util.j b/j/util.j
@@ -140,9 +140,12 @@ function find_in_path(fname)
     if fname[1] == '/'
         return fname
     end
-    loadpath = { "", "$JULIA_HOME/", "$JULIA_HOME/j/" }
-    for pfx in loadpath
-        pfxd = strcat(pfx,fname)
+    for pfx in LOAD_PATH
+        if pfx != "" && pfx[end] != '/'
+            pfxd = strcat(pfx,"/",fname)
+        else
+            pfxd = strcat(pfx,fname)
+        end
         if is_file_readable(pfxd)
             return pfxd
         end