Fixes upon fixes

src/init.lua

@@ -74,11 +74,13 @@ local function recovery()
 			print("Installing sPhone...")
 			sleep(0.5)
 			setfenv(
-			loadstring(http.get("https://raw.githubusercontent.com/SertexTeam/sPhone/master/src/installer.lua").readAll()),
+				loadstring(http.get("https://raw.githubusercontent.com/SertexTeam/sPhone/master/src/installer.lua")
+				.readAll()),
 				getfenv())()
 		elseif k == 3 then
 			setfenv(
-			loadstring(http.get("https://raw.githubusercontent.com/SertexTeam/sPhone/master/src/installer.lua").readAll()),
+				loadstring(http.get("https://raw.githubusercontent.com/SertexTeam/sPhone/master/src/installer.lua")
+				.readAll()),
 				getfenv())()
 		elseif k == 4 then
 			fs.delete("/.sPhone/config")
@@ -124,9 +126,9 @@ while true do
 	end
 end
 
-if not fs.exists("/.sPhone/sPhone") then
+if not fs.exists("/.sPhone/sPhone.lua") then
 	printError("sPhone not installed")
-	shell.run("/.sPhone/init -u")
+	shell.run("/.sPhone/init.lua -u")
 	return
 end
 
@@ -145,7 +147,6 @@ end
 
 if not pocket or not term.isColor() then
 	printError("Computer not supported: use an Advanced Pocket Computer or an Advanced Wireless Pocket Computer")
-	return
 end
 
 local tArgs = { ... }

src/sPhone.lua

@@ -76,11 +76,8 @@ local function kernel(...)
 		term.setTextColor(colors.black)
 		if not fs.isDir("/.sPhone/autorun/" .. v) then
 			if not sPhone.safeMode then
-				local f = fs.open("/.sPhone/autorun/" .. v, "r")
-				local script = f.readAll()
-				f.close()
 				print("Loading script " .. v)
-				local ok, err = pcall(function() setfenv(loadstring(script), getfenv())() end)
+				local ok, err = pcall(loadfile("/.sPhone/autorun/" .. v, "t", _ENV))
 				if not ok then
 					term.setTextColor(colors.red)
 					print("Script error: " .. v .. ": " .. err)
@@ -1069,14 +1066,14 @@ local function kernel(...)
 		local f = fs.open("/.sPhone/apps/spk/" .. spk .. "/.spk", "r")
 		local script = f.readAll()
 		f.close()
-		_config = textutils.unserialize(script)
+		local _config = textutils.unserialize(script)
 		if not script then
 			return false, "config corrupted"
 		end
 
-		local result = {}
+		local func, err = loadfile(
-		local ok, err = pcall(function()
+			fs.combine("/.sPhone/apps/spk", _config.id .. "/files/" .. _config.main),
-			result = { setfenv(loadfile(fs.combine("/.sPhone/apps/spk", _config.id .. "/files/" .. _config.main)),
+			"t",
 			setmetatable({
 				spk = {
 					getName = function()
@@ -1113,9 +1110,14 @@ local function kernel(...)
 				},
 				string = string,
 				sPhone = sPhone,
-				}, { __index = getfenv() }))() }
+			}, { __index = _ENV })
-		end)
+		)
 
+		if not func then
+			return false, err
+		end
+
+		local ok, result = pcall(func)
 		if not ok then
 			return false, err
 		end