AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-10 07:45:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

OpenOS: fix ls -l on Lua 5.4

Browse Source
This commit is contained in:
Adrian Siekierka 2023-06-04 09:28:05 +02:00
parent 9c95f10879
commit 34e1f1f131
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/assets/opencomputers/loot/openos/bin/tree.lua
View File

@ -231,7 +231,7 @@ local function formatTime(epochms) -- from /lib/core/full_ls.lua
if opts["full-time"] then if opts["full-time"] then
return string.format("%s-%s-%s %s:%s:%s ", d.year, pad(nod(d.month)), pad(day), hour, min, sec) return string.format("%s-%s-%s %s:%s:%s ", d.year, pad(nod(d.month)), pad(day), hour, min, sec)
else else
return string.format("%s %+2s %+2s:%+2s ", month_names[d.month]:sub(1,3), day, hour, pad(min)) return string.format("%s %2s %2s:%2s ", month_names[d.month]:sub(1,3), day, hour, pad(min))
end end
end end

2
src/main/resources/assets/opencomputers/loot/openos/lib/core/boot.lua
View File

@ -1,7 +1,7 @@
-- called from /init.lua -- called from /init.lua
local raw_loadfile = ... local raw_loadfile = ...
_G._OSVERSION = "OpenOS 1.8.1" _G._OSVERSION = "OpenOS 1.8.2"
-- luacheck: globals component computer unicode _OSVERSION -- luacheck: globals component computer unicode _OSVERSION
local component = component local component = component

4
src/main/resources/assets/opencomputers/loot/openos/lib/core/full_ls.lua
View File

@ -139,7 +139,7 @@ local function formatDate(epochms)
if ops["full-time"] then if ops["full-time"] then
return string.format("%s-%s-%s %s:%s:%s ", d.year, pad(nod(d.month)), pad(day), hour, min, sec) return string.format("%s-%s-%s %s:%s:%s ", d.year, pad(nod(d.month)), pad(day), hour, min, sec)
else else
return string.format("%s %+2s %+2s:%+2s ", month_names[d.month]:sub(1,3), day, hour, pad(min)) return string.format("%s %2s %2s:%2s ", month_names[d.month]:sub(1,3), day, hour, pad(min))
end end
end end
@ -222,7 +222,7 @@ local function display(names)
local write_mode = info.fs.isReadOnly() and '-' or 'w' local write_mode = info.fs.isReadOnly() and '-' or 'w'
local size = formatSize(info.size) local size = formatSize(info.size)
local modDate = formatDate(info.time) local modDate = formatDate(info.time)
local format = "%s-r%s %+"..tostring(max_size_width).."s %"..tostring(max_date_width).."s" local format = "%s-r%s %"..tostring(max_size_width).."s %"..tostring(max_date_width).."s"
local meta = string.format(format, file_type, write_mode, size, modDate) local meta = string.format(format, file_type, write_mode, size, modDate)
local item = info.name..link_target local item = info.name..link_target
return {{name = meta}, {color = colorize(info), name = item}} return {{name = meta}, {color = colorize(info), name = item}}