pootercraft/ccpt
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bugfixes/Cleanup installer

Browse Source
This commit is contained in:
PentagonLP 2021-05-31 23:01:30 +02:00
parent 7593410b4a
commit a6c7358581
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ccptinstall.lua
View File

@ -73,7 +73,7 @@ end
@return Table|boolean result|error: The result of the request; If the URL is not reachable, an error is printed in the terminal and boolean false is returned @return Table|boolean result|error: The result of the request; If the URL is not reachable, an error is printed in the terminal and boolean false is returned
--]] --]]
function gethttpresult(url) function gethttpresult(url)
if not http.checkURL(defaultpackageurl) then if not http.checkURL(url) then
print("ERROR: Url '" .. url .. "' is blocked in config. Unable to fetch data.") print("ERROR: Url '" .. url .. "' is blocked in config. Unable to fetch data.")
return false return false
end end
@ -85,20 +85,6 @@ function gethttpresult(url)
return result return result
end end
--[[ Gets table from HTTP URL
@param String url: The desired URL
@return Table|boolean result|error: The content of the site parsed into a table; If the URL is not reachable, an error is printed in the terminal and boolean false is returned
--]]
function gethttpdata(url)
result = gethttpresult(url)
if result == false then
return false
end
data = result.readAll()
data = string.gsub(data,"\n","")
return textutils.unserialize(data)
end
--[[ Download file HTTP URL --[[ Download file HTTP URL
@param String filepath: Filepath where to create file (if file already exists, it gets overwritten) @param String filepath: Filepath where to create file (if file already exists, it gets overwritten)
@param String url: The desired URL @param String url: The desired URL
@ -112,6 +98,16 @@ function downloadfile(filepath,url)
storeFile(filepath,result.readAll()) storeFile(filepath,result.readAll())
end end
-- MISC HELPER FUNCTIONS --
--[[ Checks wether a String starts with another one
@param String haystack: String to check wether is starts with another one
@param String needle: String to check wether another one starts with it
@return boolean result: Wether the firest String starts with the second one
]]--
function startsWith(haystack,needle)
return string.sub(haystack,1,string.len(needle))==needle
end
-- MAIN PROGRAMM -- -- MAIN PROGRAMM --
if (args[1]=="install") or (args[1]==nil) then if (args[1]=="install") or (args[1]==nil) then
print("[Installer] Well, hello there!") print("[Installer] Well, hello there!")
@ -146,8 +142,13 @@ elseif args[1]=="remove" then
fs.delete("/ccpt") fs.delete("/ccpt")
fs.delete("/.ccpt") fs.delete("/.ccpt")
shell.setCompletionFunction("ccpt", nil) shell.setCompletionFunction("ccpt", nil)
print("[Installer] Successfully uninstalled 'ccpt'!") print("[Installer] Removing 'ccpt' from startup...")
if file_exists("startup") and startsWith(startup,"-- ccpt: Seach for updates\nshell.run(\"ccpt\",\"startup\")") then
print("[Installer] Removing 'ccpt' from startup...")
startup = readFile("startup","")
storeFile("startup",string.sub(startup,56))
end
print("[Installer] So long, and thanks for all the fish!") print("[Installer] So long, and thanks for all the fish!")
else else
print("Invalid argument: " .. args[1]) print("[Installer] Invalid argument: " .. args[1])
end end