From 56af6d1ade673edf13a8121dd6558f07ed4d0aa6 Mon Sep 17 00:00:00 2001 From: Skye M Date: Tue, 12 May 2020 16:29:44 +0100 Subject: [PATCH] Fix document generation on Windows (using Git Bash) * Made finddesc.lua execute commands using `sh -c 'command'`, which ensures that Unix-like shell is used instead of cmd.exe * Made finddesc.lua avoid a situation where it would end up with a double '/' in `outpath` * Redirect output of deleting the document to null to avoid pointless "No such file or directory" errors. --- build.sh | 2 +- finddesc.lua | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 0ff5e23..a20c7b7 100755 --- a/build.sh +++ b/build.sh @@ -8,7 +8,7 @@ cat target/version.lua target/init.lua > target/tinit.lua mv target/tinit.lua target/init.lua cp -r service/ lib/ cfg/ target/ rm target/version.lua -rm -r doc/ +rm -r doc/ &>/dev/null $LUA finddesc.lua doc/ $(find lib/ module/ -type f|sort) $LUA gendoc.lua target/doc/kernel.dict $(find module/ -type f|sort) pandoc doc/apidoc.md docs-metadata.yml --template=template.tex -o doc/apidoc.pdf diff --git a/finddesc.lua b/finddesc.lua index dde9e07..3b000d6 100644 --- a/finddesc.lua +++ b/finddesc.lua @@ -36,7 +36,8 @@ local function formatDocs(fd) return rs end -os.execute("mkdir -p "..outpath) +os.execute("sh -c 'mkdir -p "..outpath .. "'") +if outpath:sub(#outpath) == "/" then outpath = outpath:sub(1, #outpath - 1) end local ad = io.open(outpath.."/apidoc.md","w") for k,v in pairs(tA) do @@ -44,7 +45,7 @@ for k,v in pairs(tA) do local ds = formatDocs(fd) print(string.format("%s: %i",v,ds:len())) if ds and ds:len() > 0 then - os.execute("mkdir -p $(dirname \""..outpath.."/"..v.."\")") + os.execute("sh -c 'mkdir -p $(dirname \""..outpath.."/"..v.."\")'") local f = io.open(outpath.."/"..v:gsub("%.lua$",".md"),"wb") f:write(string.format("# %s\n\n",v)) f:write(ds)