diff --git a/contrib/julia-config.jl b/contrib/julia-config.jl index 8586d1d966917..928d9c1f94a29 100755 --- a/contrib/julia-config.jl +++ b/contrib/julia-config.jl @@ -21,20 +21,9 @@ function includeDir() joinpath(match(r"(.*)(bin)",JULIA_HOME).captures[1],"include","julia"); end -function osxInitDir() - if imagePath()[end-1:end] == "ji" - return match(r"(.*)(/julia/sys.ji)",imagePath()).captures[1]; - else - return match(r"(.*)(/julia/sys.dylib)",imagePath()).captures[1]; - end -end - -function linuxInitDir() - if imagePath()[end-1:end] == "ji" - return match(r"(.*)(/julia/sys.ji)",imagePath()).captures[1]; - else - return match(r"(.*)(/julia/sys.so)",imagePath()).captures[1]; - end +function unixInitDir() + filePart = split(imagePath(),"/")[end] + return match(Regex("(.*)(/julia/$filePart)"),imagePath()).captures[1]; end function windowsInitDir() @@ -46,8 +35,7 @@ function windowsInitDir() end function initDir() - @osx_only return osxInitDir(); - @linux_only return linuxInitDir(); + @unix_only return unixInitDir(); @windows_only return windowInitDir(); end