diff options
| author | Philipp Gesang <phg42.2a@gmail.com> | 2014-12-09 23:03:24 +0100 |
|---|---|---|
| committer | Philipp Gesang <phg42.2a@gmail.com> | 2014-12-09 23:03:24 +0100 |
| commit | ff9c47695c00c96ade844f4b2644fca5e1f96be1 (patch) | |
| tree | 5b90a0f410aca60cffde3867c41ecfbdb46db702 /scripts | |
| parent | 0c443eae5ad75d999e0c41d42d5ab3530024a611 (diff) | |
| download | luaotfload-ff9c47695c00c96ade844f4b2644fca5e1f96be1.tar.gz | |
[import] fix destination path building in import procedure
D’oh!
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mkimport | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mkimport b/scripts/mkimport index 8622d5e..fe9f4b4 100644 --- a/scripts/mkimport +++ b/scripts/mkimport @@ -268,7 +268,7 @@ local news = function () local kind = def.kind local fullname = derive_fullname (cat, name, kind) local fullpath = file.join (location, fullname) - local subdir, ourname = derive_ourname (ours or name) + local subdir, ourname = derive_ourname (ours or name, kind) local ourpath = file.join (fontloader_subdir, subdir, ourname) -- relative local imported = false @@ -368,11 +368,11 @@ local import_file = function (name, kind, def, cat) if not cat then die ("missing category for file " .. name .. " -- WTF‽") end local dname = def.name - local dours = def.ours + local dours = def.ours or dname local dkind = def.kind local srcdir = derive_category_path (cat) local fullname = derive_fullname (cat, dname, kind) - local subdir, ourname = derive_ourname (dname, kind) + local subdir, ourname = derive_ourname (dours, kind) local ourpath = file.join (fontloader_subdir, subdir) local src = file.join (srcdir, fullname) local dst = file.join (ourpath, ourname) |