From 42d9d4578fa496bcdcc1c03c1d7849ecbc68eb63 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Thu, 22 Feb 2018 14:18:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B9=D0=BE-=D1=85=D0=BE-=D1=85=D0=BE,=20?= =?UTF-8?q?=D0=B0=D0=B4=D0=BC=D0=B8=D1=80=D0=B0=D0=BB=20=D0=9A=D1=83=D0=BD?= =?UTF-8?q?=D1=8C=D0=BA=D0=B0=20=D0=B7=D0=B0=20=D0=B1=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Applications/AppMarket/Main.lua | 6 +++--- Files.cfg | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Applications/AppMarket/Main.lua b/Applications/AppMarket/Main.lua index 02d8698b..5ce20c42 100644 --- a/Applications/AppMarket/Main.lua +++ b/Applications/AppMarket/Main.lua @@ -16,7 +16,7 @@ local unicode = require("unicode") -------------------------------------------------------------------------------- -local host = "http://eliteclubsessions.ru/MineOSAPI/2.01/" +local host = "http://eliteclubsessions.ru/MineOSAPI/2.02/" local iconCheckReponseTime = 0.5 local overviewIconsCount = 10 @@ -533,7 +533,7 @@ local function download(publication) govnoed(dependency, i + 1) if getUpdateState(dependency) < 4 then - fileVersions[dependency.file_id] = { + fileVersions[publication.all_dependencies[i]] = { path = dependencyPath, version = dependency.version, } @@ -1292,7 +1292,7 @@ updateFileList = function(category_id, updates) if getUpdateState(dependency) < 4 then local dependencyPath = getDependencyPath(fileVersions[publication.file_id].path, dependency) - fileVersions[dependency.file_id] = { + fileVersions[publication.all_dependencies[j]] = { path = dependencyPath, version = dependency.version, } diff --git a/Files.cfg b/Files.cfg index 539820e4..0044a15d 100644 --- a/Files.cfg +++ b/Files.cfg @@ -49,10 +49,12 @@ { path="/MineOS/System/Localizations/Russian.lang", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Localizations/OS/Russian.lang", + fileID=553, }, { path="/MineOS/System/Localizations/English.lang", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Localizations/OS/English.lang", + fileID=554, }, }, duringInstall = { @@ -106,95 +108,118 @@ { path="/MineOS/System/Extensions/Lua/ContextMenu.lua", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Extensions/Lua/ContextMenu.lua", + file_id=150, }, { path="/MineOS/System/Extensions/Lua/Launcher.lua", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Extensions/Lua/Launcher.lua", + file_id=151, }, { path="/MineOS/System/Extensions/Pic/ContextMenu.lua", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Extensions/Pic/ContextMenu.lua", + file_id=152, }, { path="/MineOS/System/Extensions/Arc/Launcher.lua", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Extensions/Arc/Launcher.lua", + file_id=153, }, -- Системные иконки { path="/MineOS/System/Icons/Application.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Application.pic", + file_id=131, }, { path="/MineOS/System/Icons/3DModel.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/3DModel.pic", + file_id=132, }, { path="/MineOS/System/Icons/Computer.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Computer.pic", + file_id=133, }, { path="/MineOS/System/Icons/Robot.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Robot.pic", + file_id=134, }, { path="/MineOS/System/Icons/Tablet.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Tablet.pic", + file_id=135, }, { path="/MineOS/System/Icons/Pastebin.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Pastebin.pic", + file_id=136, }, { path="/MineOS/System/Icons/HDD.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/HDD.pic", + file_id=137, }, { path="/MineOS/System/Icons/Floppy.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Floppy.pic", + file_id=138, }, { path="/MineOS/System/Icons/Steve.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Steve.pic", + file_id=139, }, { path="/MineOS/System/Icons/Folder.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Folder.pic", + file_id=140, }, { path="/MineOS/System/Icons/FileNotExists.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/FileNotExists.pic", + file_id=141, }, { path="/MineOS/System/Icons/Script.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Script.pic", + file_id=142, }, { path="/MineOS/System/Icons/Text.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Text.pic", + file_id=143, }, { path="/MineOS/System/Icons/Config.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Config.pic", + file_id=144, }, { path="/MineOS/System/Icons/Image.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Image.pic", + file_id=145, }, { path="/MineOS/System/Icons/Lua.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Lua.pic", + file_id=146, }, { path="/MineOS/System/Icons/SampleIcon.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/SampleIcon.pic", + file_id=147, }, { path="/MineOS/System/Icons/Archive.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Archive.pic", + file_id=148, }, { path="/MineOS/System/Icons/Trash.pic", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Icons/Trash.pic", + file_id=149, }, -- Скринсейверы {