summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2010-03-12 13:14:34 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2010-03-12 13:14:34 +0200
commitb2c0fdd69524d4eb97a5f0350fae195bf3c6c3fa (patch)
treeb918fb1096500a61483b333891179d411e90d556
parent8070e6c1b481dcd340810ddc680aaccbf4ef1997 (diff)
downloadluaotfload-b2c0fdd69524d4eb97a5f0350fae195bf3c6c3fa.tar.gz
LUAROCKS_UNAME_S doesn't work in tex mode
Use os.type and os.name instead, if os.name doesn't return cygwin then luatex need to be fixed.
-rw-r--r--mkluatexfontdb.lua2
-rw-r--r--otfl-font-nms.lua20
2 files changed, 3 insertions, 19 deletions
diff --git a/mkluatexfontdb.lua b/mkluatexfontdb.lua
index e8ce1a5..d4782ea 100644
--- a/mkluatexfontdb.lua
+++ b/mkluatexfontdb.lua
@@ -95,7 +95,7 @@ local function do_run_fc_cache(c)
-- TODO: detect if fc-cache is available
end
local toexec = 'fc-cache'
- if fonts.system == 'windows' then
+ if os.type == 'windows' then
toexec = 'fc-cache.exe' -- TODO: to test on a non-cygwin Windows
end
log('executing %s...\n', toexec)
diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua
index ba15f1c..aa958ea 100644
--- a/otfl-font-nms.lua
+++ b/otfl-font-nms.lua
@@ -277,33 +277,17 @@ local function load_font(filename, fontnames, status, newfontnames, newstatus, t
end
end
--- We need to detect the OS (especially cygwin) to convert paths.
-local system = LUAROCKS_UNAME_S or io.popen("uname -s"):read("*l")
-if system then
- if system:match("^CYGWIN") then
- system = 'cygwin'
- elseif system:match("^Windows") then
- system = 'windows'
- else
- system = 'unix'
- end
-else
- system = 'unix' -- ?
-end
-
-fonts.system = system
-
-- path normalization:
-- - a\b\c -> a/b/c
-- - a/../b -> b
-- - /cygdrive/a/b -> a:/b
local function path_normalize(path)
- if system ~= 'unix' then
+ if os.type ~= 'unix' then
path = path:gsub('\\', '/')
path = path:lower()
end
path = file.collapse_path(path)
- if system == "cygwin" then
+ if os.name == "cygwin" then
path = path:gsub('^/cygdrive/(%a)/', '%1:/')
end
return path