From 8eaeb46a0fe93d4653f581fdfed65c6dcbfda97f Mon Sep 17 00:00:00 2001 From: Vexatos Date: Wed, 15 Apr 2015 21:23:49 +0200 Subject: [PATCH 1/2] Update oppm.lua --- src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua b/src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua index c7811b00a..ecf2ff22f 100644 --- a/src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua +++ b/src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua @@ -575,7 +575,7 @@ if options.iKnowWhatIAmDoing then printUsage() return end - return + return true end --Very much not stolen from Sangar's install.lua @@ -631,6 +631,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 From e294ec4050b4da06a864493f4c1b252c19d789c3 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Wed, 15 Apr 2015 21:27:26 +0200 Subject: [PATCH 2/2] Actually tried fixing OPPM auto-installer --- src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua b/src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua index ecf2ff22f..64df24d0c 100644 --- a/src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua +++ b/src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua @@ -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]) @@ -575,7 +576,7 @@ if options.iKnowWhatIAmDoing then printUsage() return end - return true + return end --Very much not stolen from Sangar's install.lua