.gitignore

@@ -1,6 +1,3 @@
 /build
 apidoc.md
 apidoc.html
-psychos/
-psychos.cpio
-psychos-tarbomb.cpio

build.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+cp ../OC-Minitel/minitel.lua service/minitel.lua
 mkdir build
 cd module
 cat sched.lua syslog.lua vt100.lua fs.lua iofs.lua loadfile.lua vt-task.lua io.lua createterms.lua init.lua > ../build/psychos.lua

exec/mkarchive.lua

@@ -1,7 +1,7 @@
 local tArgs = {...}
-local output = table.remove(tArgs,#tArgs)
+local output = tArgs[2]
 local of = io.open(output,"wb")
-local files, dirs = {}, {tArgs[1] or "."}
+local files, dirs = {}, {tArgs[1]}
 
 local function cint(n,l)
  local t={}

exec/unarchive.lua

@@ -1,51 +0,0 @@
-local tArgs = {...}
-
-local function toint(s)
- s=s or ""
- local n = 0
- local i = 1
- while true do
-  local p = s:sub(i,i)
-  if p == "" then break end
-  local b = string.byte(p)
-  n = n << 8
-  n = n | b
-  i=i+1
- end
- return n
-end
-
-local fi = io.open(tArgs[1])
-while true do
- local nlen = toint(fi:read(2))
- if nlen == 0 then
-  break
- end
- local name = fi:read(nlen)
- local fsize = toint(fi:read(2))
- io.write(string.format("%s: %d... ",name,fsize))
- if not tArgs[2] then
-  local dir = name:match("(.+)/.*%.?.+")
-  if (dir) then
-   fs.makeDirectory(dir)
-  end
-  local f = io.open(name,"wb")
-  local rsize,buf = fsize, ""
-  if f then
-   repeat
-    buf = fi:read(math.min(rsize,1024))
-    f:write(buf)
-    rsize = rsize - buf:len()
-   until rsize <= 1
-   f:close()
-  end
- else
-  local rsize = fsize
-  repeat
-   buf = fi:read(math.min(rsize,1024))
-   rsize = rsize - buf:len()
-  until rsize <= 1
- end
- print(fsize)
-end
-fi:close()

package.sh

@@ -4,6 +4,6 @@ mkdir psychos
 cp -r exec/ lib/ service/ psychos/
 cp build/psychos.lua psychos/init.lua
 cp default-init.txt psychos/init.txt
-find psychos/ | cpio -oHbin > psychos.cpio
+tree -if psychos/ | cpio -oHbin > psychos.cpio
 cd psychos
-find | cpio -oHbin > ../psychos-tarbomb.cpio
+tree -if | cpio -oHbin > ../psychos-tarbomb.cpio