Merge branch 'patch-23' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10

This commit is contained in:
Florian Nücke 2015-04-18 12:58:29 +02:00
commit 1bda68f59d

View File

@ -505,6 +505,7 @@ local function installPackage(pack,path,update)
term.write("Done.\n")
saveToFile(tPacks)
print("Successfully installed package "..pack)
return true
end
local function uninstallPackage(pack)
@ -565,7 +566,7 @@ if options.iKnowWhatIAmDoing then
provideInfo(args[2])
elseif args[1] == "install" then
if not getInternet() then return end
installPackage(args[2],args[3],false)
return installPackage(args[2],args[3],false)
elseif args[1] == "update" then
if not getInternet() then return end
updatePackage(args[2])
@ -631,6 +632,10 @@ if not result then
error(reason, 0)
end
if not reason then
return
end
print("All done! Please remove the Floppy Disk used for installation! Reboot now? [Y/n]")
local result = io.read()
if not result or result == "" or result:sub(1, 1):lower() == "y" then