From 9bf63bee010d594342ca83d52c734e7535ba939c Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Thu, 19 Nov 2015 06:45:09 +0300 Subject: [PATCH] aef --- Applications/init.lua | 4 ++-- Installer/Installer.lua | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Applications/init.lua b/Applications/init.lua index d997f854..653b18ef 100644 --- a/Applications/init.lua +++ b/Applications/init.lua @@ -183,7 +183,7 @@ end --Загружаем необходимые библиотеки, дабы избежать потерь памяти _G._OSLANGUAGE = require("MineOS/System/OS/Language") _G.computer = require("computer") ---_G.ecs = require("ECSAPI") +_G.ecs = require("ECSAPI") _G.component = require("component") _G.gpu = _G.component.gpu @@ -191,7 +191,7 @@ _G.gpu = _G.component.gpu if component.isAvailable("modem") then component.modem.open(512) end --Масштаб ---ecs.setScale(1) +ecs.setScale(1) --Сообщаем системе, что все прогружено и готово к работе --Хз, так надо просто. Не ебись diff --git a/Installer/Installer.lua b/Installer/Installer.lua index c9e42e4f..1056dcb9 100644 --- a/Installer/Installer.lua +++ b/Installer/Installer.lua @@ -20,7 +20,7 @@ if gpu.maxResolution() < 150 then table.insert(govno, "Bad GPU - this OS require if gpu.getDepth() < 8 and gpu.maxResolution() < 150 then table.insert(govno, "Bad Screen - this OS requires Tier 3 screen.") end --Проверяем оперативку ---if math.floor(computer.totalMemory() / 1024 ) < 2048 then table.insert(govno, "Not enough RAM - this OS requires at least 2048 KB RAM.") end +if math.floor(computer.totalMemory() / 1024 ) < 2048 then table.insert(govno, "Not enough RAM - this OS requires at least 2048 KB RAM.") end if fs.get("bin/edit.lua") == nil or fs.get("bin/edit.lua").isReadOnly() then table.insert(govno, "You can't install MineOS on floppy disk. Run \"install\" in command line and install OpenOS from floppy to HDD first. After that you're be able to install MineOS from Pastebin.") end @@ -432,7 +432,7 @@ local apps = { "Autorun.app", "BufferDemo.app", "Matrix.app", - "AppStore.app", + "InfoPanel.app", } local dockApps = { @@ -462,6 +462,11 @@ end ecs.createShortCut(desktopPath .. "Pictures.lnk", picturesPath) ecs.createShortCut("MineOS/System/OS/Wallpaper.lnk", picturesPath .. "AhsokaTano.pic") +--Автозагрузка +local file = io.open("autorun.lua", "w") +file:write("local success, reason = pcall(loadfile(\"OS.lua\")); if not success then print(\"Ошибка: \" .. tostring(reason)) end") +file:close() + computer.shutdown(true) @@ -471,3 +476,7 @@ computer.shutdown(true) + + + +