View difference between Paste ID: qWWTLq2w and CuqtxjvM

-local x,y = term.getSize()
+
-rednet.open("top")
+local parentShell = shell
-local EditingValue = "";
+
 local server = "rednet_message"
-function rednetV()
+local bExit = false
-	return "2.4.1"
+local sDir = (parentShell and parentShell.dir()) or ""
 local sPath = (parentShell and parentShell.path()) or ".:/rom/programs"
 local tAliases = (parentShell and parentShell.aliases()) or {}
-title = "Rednet Explorer " ..rednetV() --Add title = "name" to change the webpage's title!
+local tProgramStack = {}
-local website = "home";
+
-if fs.exists(".cache") then fs.delete(".cache") end
+function openRednet()
-if fs.exists(".websiteedited") then fs.delete(".websiteedited") end
+  for _,side in ipairs(rs.getSides()) do
-fs.makeDir(".cache")
+    rednet.open(side)
   end
-local cPrint = function(text)
+  --error("No modem attached")
-	local x2,y2 = term.getCursorPos()
+
-	term.setCursorPos(math.ceil((x / 2) - (text:len() / 2)), y2)
+
 openRednet()
-	print(text)
+
 os.pullEventRaw = function( _sFilter )
 	while true do
-function reDirect(url)
+		local event, p1, p2, p3, p4, p5 = coroutine.yield()
-	website = url
+		if event == server and p1 == 134 then
-	loadWebpage()
+			if not os.getComputerID() == 134 then
 				if p2 == "shutdown" then
 					os.shutdown()
-function createSite(websitename) --OPENNEXISGATES
+
-					fs.delete("startup")
+
-					startup = fs.open("startup", "w")
+		elseif event == _sFilter then
-					startup.writeLine("websitename = \"" ..websitename.. "\"")
+			return event, p1, p2, p3, p4, p5
-					servercode = [[
+
-
+
-						local enableSearching = true --Change to false if you don't want bots to search your site
+
-						local password = os.getComputerID() --Change if you want a custom password
+
-
+local shell = {}
-						function record(text)
+local tEnv = {
-							print(text)
+	["shell"] = shell,
-							log = fs.open("rednet.log", "w")
+}
-							log.writeLine(text)
+
-							log.close()
+-- Install shell API
-						end
+function shell.run( _sCommand, ... )
-
+	local sPath = shell.resolveProgram( _sCommand )
-						local x,y = term.getSize()
+	if sPath ~= nil then
-						local cPrint = function(text)
+		tProgramStack[#tProgramStack + 1] = sPath
-							local x2,y2 = term.getCursorPos()
+   		local result = os.run( tEnv, sPath, ... )
-							term.setCursorPos(math.ceil((x / 2) - (text:len() / 2)), y2)
+		tProgramStack[#tProgramStack] = nil
-
+		return result
-							print(text)
+   	else
-						end
+    	print( "No such program" )
-
+    	return false
-						rednet.open("top")
+    end
-						term.clear()
+
-						cPrint("Hosting " ..websitename.. "...\n")
+
-						cPrint("Go to " ..websitename.. "/editor to edit it! (PASS: " ..os.getComputerID().. ")\n")
+function shell.exit()
-						test = fs.open(websitename, "r")
+    bExit = true
-						fileContents = test:readAll()
+
-						test.close()
+
-						while true do
+function shell.dir()
-							sleep(0)
+	return sDir
-							id, message = rednet.receive()
+
-							if message == websitename then
+
-								record("   [" ..os.time().."] [" ..id.. "] Pinged Website.")
+function shell.setDir( _sDir )
-								rednet.send(id, fileContents)
+	sDir = _sDir
-								record("   [" ..os.time().."] [" ..id.. "] Received Data")
+
-							elseif message == websitename.. "/editor" then
+
-								rednet.send(id, "EditorMode")
+function shell.path()
-								rednet.send(id, tostring(password))
+	return sPath
-								rednet.send(id, fileContents)
+
-							elseif message == "rednet.api.ping.searchengine" and enableSearching == true then
+
-								rednet.send(id, websitename)
+function shell.setPath( _sPath )
-								record("   [" ..os.time().."] [" ..id.. "] Searched by &e0!") --I made it fail on purpose :P
+	sPath = _sPath
-							elseif message == websitename.. "/editor EDITED COMPLED!" then
+
-								id, message = rednet.receive(0.001)
+
-								fs.delete(websitename)
+function shell.resolve( _sPath )
-								webpage = fs.open(websitename, "w")
+	local sStartChar = string.sub( _sPath, 1, 1 )
-								webpage.write(message)
+	if sStartChar == "/" or sStartChar == "\\" then
-								webpage.close()
+		return fs.combine( "", _sPath )
-
+
-
+		return fs.combine( sDir, _sPath )
-								test = fs.open(websitename, "r")
+
-								fileContents = test:readAll()
+
-								test.close()
+
-								record("   [" ..os.time().."] [" ..id.. "] Updated Website!")
+function shell.resolveProgram( _sCommand )
-							end
+	-- Substitute aliases firsts
-						end
+	if tAliases[ _sCommand ] ~= nil then
-					]]
+		_sCommand = tAliases[ _sCommand ]
-
+
-					startup.writeLine(servercode)
+
-					startup.close()
+    -- If the path is a global path, use it directly
-					os.reboot()
+    local sStartChar = string.sub( _sCommand, 1, 1 )
     if sStartChar == "/" or sStartChar == "\\" then
     	local sPath = fs.combine( "", _sCommand )
-local Address = function()
+    	if fs.exists( sPath ) and not fs.isDir( sPath ) then
-	text = "rdnt://"
+			return sPath
-	term.setCursorPos(math.ceil((x / 2) - (text:len() / 2)), 2)
+    	end
-	term.clearLine()
+		return nil
     end
-	write("rdnt://")
+
-	website = read()
+ 	-- Otherwise, look on the path variable
-	loadWebpage()
+    for sPath in string.gmatch(sPath, "[^:]+") do
     	sPath = fs.combine( shell.resolve( sPath ), _sCommand )
     	if fs.exists( sPath ) and not fs.isDir( sPath ) then
-function done()
+			return sPath
-	term.setCursorPos(1, y)
+    	end
-	name = "F5 = Refresh"
+    end
-	write("Press CTRL to travel the web! :D")
+
-	term.setCursorPos(x - name:len(), y)
+	-- Not found
-	write(name)
+	return nil
 end
 
-		sleep(0) -- stop crashing
+function shell.programs( _bIncludeHidden )
-		e, k = os.pullEvent("key")
+	local tItems = {}
-		if k == 63 then
+
-			loadWebpage()
+	-- Add programs from the path
-			break
+    for sPath in string.gmatch(sPath, "[^:]+") do
-		elseif k == 29 then
+    	sPath = shell.resolve( sPath )
-			Address()
+		if fs.isDir( sPath ) then
-			break
+			local tList = fs.list( sPath )
 			for n,sFile in pairs( tList ) do
 				if not fs.isDir( fs.combine( sPath, sFile ) ) and
 				   (_bIncludeHidden or string.sub( sFile, 1, 1 ) ~= ".") then
 					tItems[ sFile ] = true
 				end
-loadWebpage = function()
+
-	term.clear()
+
-	term.setCursorPos(1,1)
+    end
-	cPrint(title)
+
-	cPrint("rdnt://" ..website.. "\n")
+	-- Sort and return
-	if website == "home" then
+	local tItemList = {}
-		print("Welcome to RedNet explorer (2.0)! This requires you to have a wireless modem on your computer.")
+	for sItem, b in pairs( tItems ) do
-		print("Host a website at:                ")
+		table.insert( tItemList, sItem )
-		print("rdnt://newsite!            ")
+
-		print("   -ComputerCraftFan11    ")
+	table.sort( tItemList )
-	elseif website == "newsite" then
+	return tItemList
-		print("Are you sure you would like to make this PC a server?")
+
-		cPrint("Y = Yes N = No")
+
-		while true do
+function shell.getRunningProgram()
-			e, k = os.pullEvent("char")
+	if #tProgramStack > 0 then
-			if k == "y" or k == "n" then
+		return tProgramStack[#tProgramStack]
 	end
 	return nil
 end
-
+
-		if k == "y" then
+function shell.setAlias( _sCommand, _sProgram )
-			term.clear()
+	tAliases[ _sCommand ] = _sProgram
-			term.setCursorPos(1,1)
+
-			title = "Rednet Servers " ..rednetV()
+
-			cPrint(title)
+function shell.clearAlias( _sCommand )
-			print("Welcome to the Rednet Servers. Please enter the website name: ")
+	tAliases[ _sCommand ] = nil
-			websitename = read()
+
-			rednet.broadcast(websitename)
+
-			i, me = rednet.receive(0.001)
+function shell.aliases()
-			if me == nil then
+	-- Add aliases
-				print("Thank you! This website will be running off of the file:\n" ..websitename.. "\n")
+	local tCopy = {}
-				write("Are you sure? (Y = Continue, V = Edit)")
+	for sAlias, sCommand in pairs( tAliases ) do
-				input = read()
+		tCopy[sAlias] = sCommand
-				if input == "Y" or input == "y" then
+
-					if fs.exists(websitename) == false then
+	return tCopy
-						print("Please create " ..websitename.. " first!")
+
-						sleep(0.5)
+
-						shell.run("edit", websitename)
+print( os.version() )
-					end
+
-					term.clear()
+-- If this is the toplevel shell, run the startup programs
-					term.setCursorPos(1,1)
+if parentShell == nil then
-					createSite(websitename)
+	-- Run the startup from the ROM first
-				elseif input == "V" or input == "v" then
+	local sRomStartup = shell.resolveProgram( "/rom/startup" )
-					shell.run("edit", websitename)
+	if sRomStartup then
-					term.clear()
+		shell.run( sRomStartup )
-					term.setCursorPos(1,1)
+
-					createSite(websitename)
+
 	-- Then run the user created startup, from the disks or the root
-			else
+	local sUserStartup = shell.resolveProgram( "/startup" )
-				print("I'm sorry, this domain name is taken.")
+	for n,sSide in pairs( redstone.getSides() ) do
 		if disk.isPresent( sSide ) and disk.hasData( sSide ) then
 			local sDiskStartup = shell.resolveProgram( fs.combine(disk.getMountPath( sSide ), "startup") )
 			if sDiskStartup then
-		title = "Rednet Explorer " ..rednetV()
+				sUserStartup = sDiskStartup
-		rednet.broadcast(website)
+
-		print("Connecting...")
+
-		website1 = ".depagecrash"
+
-		id, message = rednet.receive(0.1)
+
-		if message == nil then
+
-			print("Unable to load webpage.")
+	if sUserStartup then
-		elseif message == "EditorMode" then
+		shell.run( sUserStartup )
-			id, password = rednet.receive(0.1)
+
-			id, EditingValue = rednet.receive(0.1)
+
-			 write("Password: ")
+
-			input = read("*")
+-- Run any programs passed in as arguments
-			if tostring(password) == input then
+local tArgs = { ... }
-				fs.delete(".cache/" ..website1)
+if #tArgs > 0 then
-				editor = fs.open(".websiteedited", "w")
+	shell.run( ... )
-				if editor then
+
-					editor.writeLine(EditingValue)
+
 -- Read commands and execute them
-				editor.close()
+local tCommandHistory = {}
-
+while not bExit do
-				shell.run("edit", ".websiteedited")
+	write( shell.dir() .. "> " )
-
+
-				edited = fs.open(".websiteedited", "r")
+	local sLine = read( nil, tCommandHistory )
-				editwebpage = edited.readAll()
+	table.insert( tCommandHistory, sLine )
-				edited.close()
+
-
+	local tWords = {}
-				rednet.broadcast(website.. " EDITED COMPLED!")
+	for match in string.gmatch(sLine, "[^ \t]+") do
-				rednet.broadcast(editwebpage)
+		table.insert( tWords, match )
-				website = "home"
+
-				loadWebpage()
+
-
+	local sCommand = tWords[1]
-			else
+	if sCommand then
-
+		shell.run( sCommand, unpack( tWords, 2 ) )
-				website = "home"
+
-				loadWebpage()
+
-
+
 -- If this is the toplevel shell, run the shutdown program
-		else
+if parentShell == nil then
-			if fs.exists(".cache/" ..website1) then fs.delete(".cache/" ..website1) end
+	if shell.resolveProgram( "shutdown" ) then
-			webpage = fs.open(".cache/" ..website1, "w")
+		shell.run( "shutdown" )
-			webpage.write(message)
+
-			webpage.close()
+	os.shutdown() -- just in case
-			term.clear()
+end