From 4a83f8ba4465e2c19633bad2c179bf2dc275d7d3 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Sun, 23 Apr 2017 00:53:00 +0300 Subject: [PATCH] aefea --- Installer/installer2.lua | 18 +++++++++++------- .../{Languages => Localization}/English.lang | 0 .../{Languages => Localization}/Russian.lang | 0 3 files changed, 11 insertions(+), 7 deletions(-) rename MineOS/{Languages => Localization}/English.lang (100%) rename MineOS/{Languages => Localization}/Russian.lang (100%) diff --git a/Installer/installer2.lua b/Installer/installer2.lua index b6273fe3..ff337d99 100644 --- a/Installer/installer2.lua +++ b/Installer/installer2.lua @@ -50,12 +50,16 @@ end ------------------------------------------------------------------------------------------------------------------------------------ -local paths = {} -paths.applicationList = "/MineOS/System/OS/Applications.cfg" +local paths = { + applicationList = "/MineOS/System/OS/Applications.cfg", + OSSettings = "/MineOS/System/OS/OSSettings.cfg", +} -local urls = {} -urls.applicationList = "https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications.cfg" -urls.installer = "https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Installer/" +local urls = { + applicationList = "https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications.cfg", + installer = "https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Installer/", + EFI = "https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/MineOS/EFI.lua", +} ------------------------------------------------------------------------------------------------------------------------------------ @@ -289,7 +293,7 @@ stages[5] = function() {path = "/MineOS/Applications/Photoshop.app"}, } - table.toFile("/MineOS/System/OS/OSSettings.cfg", _G.OSSettings) + table.toFile(paths.OSSettings, _G.OSSettings) local file = io.open("/autorun.lua", "w") file:write("dofile(\"/OS.lua\")") @@ -297,7 +301,7 @@ stages[5] = function() gpu.setBackground(0x0) gpu.fill(1, 1, buffer.screen.width, buffer.screen.height, " ") - component.eeprom.set(web.request("https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/MineOS/EFI.lua")) + component.eeprom.set(web.request(urls.EFI)) require("computer").shutdown(true) end diff --git a/MineOS/Languages/English.lang b/MineOS/Localization/English.lang similarity index 100% rename from MineOS/Languages/English.lang rename to MineOS/Localization/English.lang diff --git a/MineOS/Languages/Russian.lang b/MineOS/Localization/Russian.lang similarity index 100% rename from MineOS/Languages/Russian.lang rename to MineOS/Localization/Russian.lang