View difference between Paste ID: 3W5WiVJs and X4AgTg0E

-if not http then
+local url = "https://raw.github.com/LDDestroier/CraftBang/master/craftbang/"
-	print "It doesn't seem like you have http enabled."
+local files = {}
-	print "Enable it first, restart minecraft, then run the installer again."
+local filelist = {
-	return
+	'desktop.lua';
 	'dialog.lua';
 	'panel.lua';
-local url = "https://raw.github.com/Kingdaro/CraftBang/master/installer"
+	'session.lua';
-local instPath = ".cbinstaller"
+	'terminal.lua';
 	'lib/arealib.lua';
-print "Downloading installer"
+	'lib/redirect.lua';
 }
-local download = http.get(url)
+
-if download then
+local function clear()
-	local file = fs.open(instPath, 'w')
+	term.clear()
-	file.write(download.readAll())
+	term.setCursorPos(1,1)
 end
-	download.close()
+
 clear()
-	shell.run(instPath)
+local errors = false
-	fs.delete(instPath)
+for i=1, #filelist do
 	local filename = filelist[i]
-	for _,v in pairs(rs.getSides()) do
+	local fullurl = url .. filename
-		disk.eject(v)
+	local localpath = '/craftbang/'..filename
 
 	local download = http.get(fullurl)
-	write "Restart now? [Y/n] "
+	if download then
 		print("Fetching "..filename)
 		files[localpath] = download.readAll()
-		print "I'll let you return to your shell then."
+		download.close()
-		print "Do what you need to do."
+
 		print("Couldn't get '"..filename .. "'.")
-		textutils.slowWrite("Goodbye!")
+		print "Installation failed."
-		sleep(1)
+		return
-		os.reboot()
+
 end
-else
+sleep(1)
-	print "Couldn't get installer"
+
 local installed = false
 if fs.exists('/craftbang') then
 	clear()
 	installed = true
 
 	write "Overwrite current installation? [Y/n] "
 	local input = read():lower():sub(1,1)
 	if input == 'n' then
 		print "Will not write files."
 		return
 	end
 	fs.delete('/craftbang')
 end
 
 clear()
 fs.makeDir('/craftbang')
 fs.makeDir('/craftbang/lib')
 for path, content in pairs(files) do
 	print("Writing "..path)
 	local file = fs.open(path, 'w')
 	file.write(content)
 	file.close()
 end
 print "Installation complete!"
 sleep(1)
 
 if not installed then
 	clear()
 
 	local startupContent = [[
 	shell.run("craftbang/session.lua")
 	]]
 
 	write "Run CraftBang on startup? "
 	if fs.exists('startup.lua') then
 		print "\nYour current startup file will be renamed to 'startup-old.lua'."
 	end
 	write "[Y/n] "
 
 	local input = read():lower():sub(1,1)
 
 	if input == 'n' then
 		print "In that case, run 'craftbang/session.lua' to start CraftBang."
 	else
 		if fs.exists('startup.lua') then
 			if fs.exists('startup-old.lua') then
 				fs.delete('startup-old.lua')
 			end
 			fs.move('startup.lua','startup-old.lua')
 		end
 
 		local startup = fs.open('startup.lua', 'w')
 		startup.write(startupContent)
 		startup.close()
 		print "CraftBang will now run on startup."
 	end
 end