Skip to content

Commit

Permalink
Fix other dir reference
Browse files Browse the repository at this point in the history
  • Loading branch information
randyzwitch committed Sep 2, 2016
1 parent aa7fd4c commit 23726bc
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/NoveltyColors.jl
Expand Up @@ -3,10 +3,12 @@ module NoveltyColors
export ColorDict
import JSON: parsefile

directory = dirname(@__FILE__) * "/../data/"

ColorDict = Dict{AbstractString,Any}()
for file in readdir(dirname(@__FILE__) * "/../data/")
for file in readdir(directory)
if file[end-4:end] == ".json"
merge!(ColorDict, Dict{AbstractString,Any}(file[1:end-5] => (parsefile(Pkg.dir("NoveltyColors", "data", file)))))
merge!(ColorDict, Dict{AbstractString,Any}(file[1:end-5] => (parsefile(directory * file))))
end
end

Expand Down

0 comments on commit 23726bc

Please sign in to comment.