From 9748f3449d2f7f44591b41ced1c4963cf02feacb Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Thu, 7 Jun 2018 08:44:25 +0300 Subject: [PATCH] Revert "Make installer independent of OpenOS /bin/wget.lua software" This reverts commit b68132bd547b0d5968c0df5063083eab2e35516e. --- Installer.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Installer.lua b/Installer.lua index fc6186e1..d2f9b58f 100644 --- a/Installer.lua +++ b/Installer.lua @@ -72,9 +72,14 @@ local function unserializeFile(path) return data end +local function wget(url, path) + fs.makeDirectory(fs.path(path)) + shell.execute("wget " .. url .. " " .. path .. " -fq") +end + print("Downloading MineOS file list...") local path = "/MineOS/System/Files.cfg" -_G.downloadFile(URLs.applicationList, path) +wget(URLs.applicationList, path) applicationList = unserializeFile(path) fs.remove(path) @@ -82,7 +87,7 @@ print(" ") for i = 1, #applicationList.preInstall do print("Downloading library \"" .. fs.name(applicationList.preInstall[i].path) .. "\"") - _G.downloadFile(applicationList.preInstall[i].url, applicationList.preInstall[i].path) + wget(applicationList.preInstall[i].url, applicationList.preInstall[i].path) storeFileVersion(applicationList.preInstall[i]) end