Merge pull request #15 from lualatex/master

Sync with lualatex repo

1 files changed, 7 insertions, 3 deletions

diff --git a/mkglyphlist b/mkglyphlist
index d73a608..281c736 100755
--- a/mkglyphlist
+++ b/mkglyphlist
@@ -27,9 +27,13 @@ require"lpeg"
 require"socket"
 
 kpse.set_program_name"luatex"
-dofile(kpse.find_file("lualibs-lua.lua",   "lua"))
-dofile(kpse.find_file("lualibs-lpeg.lua",  "lua"))
-dofile(kpse.find_file("lualibs-table.lua", "lua")) --- for serialization
+for _, lib in next, { "lualibs-lua.lua",
+                      "lualibs-lpeg.lua",
+                      "lualibs-table.lua", } do
+  local found = assert(kpse.find_file(lib, "lua"),
+                       "Could not locate " .. lib)
+  require(found)
+end
 
 local C, Cf, Cg, Ct, P, R =
   lpeg.C, lpeg.Cf, lpeg.Cg, lpeg.Ct, lpeg.P, lpeg.R