From da050de20e939c6a77fbabcd1d1dbbcba36b4b86 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Fri, 3 Jun 2016 08:31:52 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A5=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Installer/Installer.lua | 11 +++++++----
 lib/ECSAPI.lua          |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Installer/Installer.lua b/Installer/Installer.lua
index 1e9fa5a6..54ea2cd8 100644
--- a/Installer/Installer.lua
+++ b/Installer/Installer.lua
@@ -335,7 +335,6 @@ fs.makeDirectory(dockPath)
 --------------------------СТАДИЯ ЗАГРУЗКИ-----------------------------------
 
 do
-
   local barWidth = math.floor(windowWidth * 2 / 3)
   local xBar = math.floor(xSize/2-barWidth/2)
   local yBar = yWindowEnd - 3
@@ -347,7 +346,7 @@ do
 
   ecs.blankWindow(xWindow,yWindow,windowWidth,windowHeight)
 
-  image.draw(math.floor(xSize/2 - 33), yWindow + 2, imageDownloading)
+  image.draw(math.floor(xSize / 2 - 33), yWindow + 2, imageDownloading)
 
   ecs.colorTextWithBack(xBar, yBar - 1, ecs.colors.gray, ecs.windowColors.background, lang.osInstallation)
   ecs.progressBar(xBar, yBar, barWidth, 1, 0xcccccc, ecs.colors.blue, 0)
@@ -365,6 +364,7 @@ do
       (applications[i].forceDownload)
     then
       table.insert(thingsToDownload, applications[i])
+    end
   end
 
   for app = 1, #thingsToDownload do
@@ -373,6 +373,7 @@ do
     local percent = app / #thingsToDownload * 100
     ecs.progressBar(xBar, yBar, barWidth, 1, 0xcccccc, ecs.colors.blue, percent)
 
+    ecs.error("A<FAEfaefA", thingsToDownload[app].url)
     ecs.getOSApplication(thingsToDownload[app])
   end
 
@@ -380,8 +381,10 @@ do
 end
 
 --Создаем базовые обои рабочего стола
-ecs.createShortCut(desktopPath .. "Pictures.lnk", picturesPath)
-if downloadWallpapers then ecs.createShortCut("MineOS/System/OS/Wallpaper.lnk", picturesPath .. "Girl.pic") end
+if downloadWallpapers then
+  ecs.createShortCut(desktopPath .. "Pictures.lnk", picturesPath)
+  ecs.createShortCut("MineOS/System/OS/Wallpaper.lnk", picturesPath .. "Girl.pic")
+end
 
 --Автозагрузка
 local file = io.open("autorun.lua", "w")
diff --git a/lib/ECSAPI.lua b/lib/ECSAPI.lua
index 16198815..e77334b2 100644
--- a/lib/ECSAPI.lua
+++ b/lib/ECSAPI.lua
@@ -337,7 +337,7 @@ function ecs.getOSApplication(application)
 		ecs.getFromPastebin(application.url, application.name)
 		
 	--Если просто какой-то скрипт
-	elseif application.type == "Script" or application.type == "Library" then
+	elseif application.type == "Script" or application.type == "Library" or application.type == "Icon" or application.type == "Wallpaper" then
 		ecs.getFromGitHub(application.url, application.name)
 	
 	--А если ваще какая-то абстрактная хуйня, либо ссылка на веб, то загружаем по УРЛ-ке