From c92cf76356129b69c15c3aeca30c745671874d88 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 27 Mar 2019 14:40:14 -0700 Subject: [PATCH] Fix for finding source files when they're in the NOMSUPATH --- nomsu_environment.lua | 3 +++ nomsu_environment.moon | 2 ++ 2 files changed, 5 insertions(+) diff --git a/nomsu_environment.lua b/nomsu_environment.lua index 9e57cc6..6671f38 100644 --- a/nomsu_environment.lua +++ b/nomsu_environment.lua @@ -360,6 +360,9 @@ nomsu_environment = Importer({ if not (self.SOURCE_MAP[source_key] or self.OPTIMIZATION >= 2) then local map = { } local file = Files.read(source.filename) + if not file and NOMSU_PREFIX then + file = Files.read(tostring(NOMSU_PREFIX) .. "/share/nomsu/" .. tostring(table.concat(NOMSU_VERSION, ".")) .. "/" .. tostring(source.filename)) + end if not file then error("Failed to find file: " .. tostring(source.filename)) end diff --git a/nomsu_environment.moon b/nomsu_environment.moon index c519b06..0f5f411 100644 --- a/nomsu_environment.moon +++ b/nomsu_environment.moon @@ -235,6 +235,8 @@ nomsu_environment = Importer{ unless @SOURCE_MAP[source_key] or @OPTIMIZATION >= 2 map = {} file = Files.read(source.filename) + if not file and NOMSU_PREFIX + file = Files.read("#{NOMSU_PREFIX}/share/nomsu/#{table.concat NOMSU_VERSION, "."}/#{source.filename}") if not file error "Failed to find file: #{source.filename}" nomsu_str = file\sub(source.start, source.stop)