diff --git a/Applications/App Market.app/Main.lua b/Applications/App Market.app/Main.lua index abfc2dce..e5229ac9 100644 --- a/Applications/App Market.app/Main.lua +++ b/Applications/App Market.app/Main.lua @@ -14,7 +14,7 @@ local text = require("Text") -------------------------------------------------------------------------------- -local host = "http://eliteclubsessions.ru/MineOSAPI/2.03/" +local host = "http://eliteclubsessions.ru/MineOSAPI/2.04/" local iconCheckReponseTime = 2 local overviewIconsCount = 14 diff --git a/Applications/Reinstall OS.app/Main.lua b/Applications/Reinstall OS.app/Main.lua index 8674dca2..cc7b8d70 100644 --- a/Applications/Reinstall OS.app/Main.lua +++ b/Applications/Reinstall OS.app/Main.lua @@ -1,4 +1,4 @@ -if require("Internet").run("https://raw.githubusercontent.com/IgorTimofeev/MineOSStandalone/master/Installer/Main.lua") == nil then +if require("Internet").run("https://raw.githubusercontent.com/IgorTimofeev/MineOS/master/Installer/Main.lua") == nil then computer.shutdown(true) end diff --git a/EFI/Full.lua b/EFI/Full.lua index b2a606ec..459d5962 100644 --- a/EFI/Full.lua +++ b/EFI/Full.lua @@ -243,7 +243,7 @@ while uptime() < deadline do if internetAddress then tableInsert(utilities, 2, menuElement("Internet recovery", function() - local handle, data, result, reason = componentProxy(internetAddress).request("https://raw.githubusercontent.com/IgorTimofeev/MineOSStandalone/master/Installer/Main.lua"), "" + local handle, data, result, reason = componentProxy(internetAddress).request("https://raw.githubusercontent.com/IgorTimofeev/MineOS/master/Installer/Main.lua"), "" if handle then status(stringsMain, "Downloading recovery script") diff --git a/EFI/Minified.lua b/EFI/Minified.lua index 307bcbab..3c35cf7e 100644 --- a/EFI/Minified.lua +++ b/EFI/Minified.lua @@ -1 +1 @@ -local a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="MineOS EFI","/OS.lua","Change label","key_down","filesystem",0x2D2D2D,0xE1E1E1,0x878787,0x878787,0xE1E1E1,component.proxy,component.list,computer.pullSignal,computer.uptime,table.insert,math.max,math.min,math.huge,math.floor;local t,u,v=k(l("eeprom")()),k(l("gpu")()),l("internet")()local w,x,y,z,A,B,C,D,E=computer.shutdown,u.set,u.fill,t.setData,t.getData,u.getResolution()local F,G,H,I=function()D,E=nil,nil end,function(J)if J~=D then u.setBackground(J)D=J end end,function(J)if J~=E then u.setForeground(J)E=J end end,function(K,L,M)if#K1 then ai=ai-1 elseif ak[4]==208 and ai<#ag then ai=ai+1 elseif ak[4]==28 then if ag[ai].c then ag[ai].c()end;if ag[ai].b then return end end end end end,function(R,al)local K,am,an,ak,ao="",true;while 1 do an=al..K;y(1,R,B,1," ")H(h)x(s(B/2-#an/2),R,an..(am and"█"or""))ak={m(0.5)}if ak[1]==d then if ak[4]==28 then return K elseif ak[4]==14 then K=K:sub(1,-2)else ao=unicode.char(ak[3])if ao:match("^[%w%d%p%s]+")then K=K..ao end end;am=true elseif ak[1]=="clipboard"then K=K..ak[3]elseif not ak[1]then am=not am end end end;u.bind(l("screen")(),true)Z(a,"Hold Alt to show boot options menu")local ap,ak=n()+1;while n() "or" ")..I(au,10)..I(ab.spaceTotal()>1048576 and"HDD"or ab.spaceTotal()>65536 and"FDD"or"SYS",3)..I(av and"R"or"R/W",3)..at:sub(1,8).." "..I(string.format("%.2f",ab.spaceUsed()/ab.spaceTotal()*100).."%",6,1),function()local aw={a8()}if not av then o(aw,1,P(c,function()ab.setLabel(aa(X(2,c),"Enter new name: "))end,1))o(aw,2,P("Format",function()Z(a,"Formatting filesystem "..at)for ax,ay in ipairs(ab.list("/"))do ab.remove(ay)end;Z(a,"Formatting finished",1)end,1))end;o(aw,1,P("Set as startup",function()z(at)end,1))a9(au.." ("..at..")",aw)end,1))end;a9("Select filesystem",ar)end),P("Shutdown",function()w()end),a8()}if v then o(aq,2,P("Internet recovery",function()local ac,ad,a5,a6=k(v).request("https://raw.githubusercontent.com/IgorTimofeev/MineOSStandalone/master/Installer/Main.lua"),""if ac then Z(a,"Downloading recovery script")while 1 do a5,a6=ac.read(r)if a5 then ad=ad..a5 else ac:close()if a6 then Z(a,a6,1)else a4(ad,"=string")end;break end end else Z(a,"invalid URL-address",1)end end))end;a9(a,aq)end end;local ab=k(A())if ab and ab.exists(b)then a7(ab)else for at in l(e)do ab=k(at)if ab.exists(b)then z(at)a7(ab)break else ab=nil end end;if not ab then Z(a,"No bootable mediums found",1)end end;w() \ No newline at end of file +local a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="MineOS EFI","/OS.lua","Change label","key_down","filesystem",0x2D2D2D,0xE1E1E1,0x878787,0x878787,0xE1E1E1,component.proxy,component.list,computer.pullSignal,computer.uptime,table.insert,math.max,math.min,math.huge,math.floor;local t,u,v=k(l("eeprom")()),k(l("gpu")()),l("internet")()local w,x,y,z,A,B,C,D,E=computer.shutdown,u.set,u.fill,t.setData,t.getData,u.getResolution()local F,G,H,I=function()D,E=nil,nil end,function(J)if J~=D then u.setBackground(J)D=J end end,function(J)if J~=E then u.setForeground(J)E=J end end,function(K,L,M)if#K1 then ai=ai-1 elseif ak[4]==208 and ai<#ag then ai=ai+1 elseif ak[4]==28 then if ag[ai].c then ag[ai].c()end;if ag[ai].b then return end end end end end,function(R,al)local K,am,an,ak,ao="",true;while 1 do an=al..K;y(1,R,B,1," ")H(h)x(s(B/2-#an/2),R,an..(am and"█"or""))ak={m(0.5)}if ak[1]==d then if ak[4]==28 then return K elseif ak[4]==14 then K=K:sub(1,-2)else ao=unicode.char(ak[3])if ao:match("^[%w%d%p%s]+")then K=K..ao end end;am=true elseif ak[1]=="clipboard"then K=K..ak[3]elseif not ak[1]then am=not am end end end;u.bind(l("screen")(),true)Z(a,"Hold Alt to show boot options menu")local ap,ak=n()+1;while n() "or" ")..I(au,10)..I(ab.spaceTotal()>1048576 and"HDD"or ab.spaceTotal()>65536 and"FDD"or"SYS",3)..I(av and"R"or"R/W",3)..at:sub(1,8).." "..I(string.format("%.2f",ab.spaceUsed()/ab.spaceTotal()*100).."%",6,1),function()local aw={a8()}if not av then o(aw,1,P(c,function()ab.setLabel(aa(X(2,c),"Enter new name: "))end,1))o(aw,2,P("Format",function()Z(a,"Formatting filesystem "..at)for ax,ay in ipairs(ab.list("/"))do ab.remove(ay)end;Z(a,"Formatting finished",1)end,1))end;o(aw,1,P("Set as startup",function()z(at)end,1))a9(au.." ("..at..")",aw)end,1))end;a9("Select filesystem",ar)end),P("Shutdown",function()w()end),a8()}if v then o(aq,2,P("Internet recovery",function()local ac,ad,a5,a6=k(v).request("https://raw.githubusercontent.com/IgorTimofeev/MineOS/master/Installer/Main.lua"),""if ac then Z(a,"Downloading recovery script")while 1 do a5,a6=ac.read(r)if a5 then ad=ad..a5 else ac:close()if a6 then Z(a,a6,1)else a4(ad,"=string")end;break end end else Z(a,"invalid URL-address",1)end end))end;a9(a,aq)end end;local ab=k(A())if ab and ab.exists(b)then a7(ab)else for at in l(e)do ab=k(at)if ab.exists(b)then z(at)a7(ab)break else ab=nil end end;if not ab then Z(a,"No bootable mediums found",1)end end;w() \ No newline at end of file diff --git a/Installer/Main.lua b/Installer/Main.lua index a5652161..e5924645 100644 --- a/Installer/Main.lua +++ b/Installer/Main.lua @@ -6,7 +6,7 @@ component, computer, unicode = component or require("Component"), computer or re local EEPROMProxy, internetProxy, GPUProxy = component.proxy(component.list("eeprom")()), component.proxy(component.list("internet")()), component.proxy(component.list("gpu")()) -local repositoryURL = "https://raw.githubusercontent.com/IgorTimofeev/MineOSStandalone/master/" +local repositoryURL = "https://raw.githubusercontent.com/IgorTimofeev/MineOS/master/" local installerURL = "Installer/" local EFIURL = "EFI/Minified.lua"