Develop 1.8 #20

Merged
Kan18 merged 242 commits from develop-1.8 into master-1.8 2019-11-10 20:52:08 -05:00
2 changed files with 8 additions and 1 deletions
Showing only changes of commit f19d439314 - Show all commits

View File

@@ -3212,7 +3212,7 @@ function UI.TextArea:draw()
-- self:setCursorPos(1, 1)
self.cursorX, self.cursorY = 1, 1
self:print(self.value)
self.ymax = self.cursorY + 1
self.ymax = self.cursorY
for _,child in pairs(self.children) do
if child.enabled then

View File

@@ -14,11 +14,18 @@ end
local lua_path = package.path
-- TODO: Temporary
local upgrade = Util.readTable('usr/config/shell')
if upgrade and not upgrade.upgraded then
fs.delete('usr/config/shell')
end
if not fs.exists('usr/config/shell') then
Util.writeTable('usr/config/shell', {
aliases = shell.aliases(),
path = 'usr/apps',
lua_path = lua_path,
upgraded = true,
})
end