Fix #1293: Exit with code 1 if an error occurred

Builds should now, in most cases, properly fail if buildaction failed.

Author: patrikjuvonen

utils/buildactions/install_cef.lua

@@ -16,18 +16,6 @@ function make_cef_download_url()
 	return CEF_URL_PREFIX..http.escapeUrlParam(CEF_VERSION)..CEF_URL_SUFFIX
 end
 
-function errormsg(title, message)
-	term.pushColor(term.red)
-	io.write(title)
-	if message then
-		term.setTextColor(term.purple)
-		print(" " .. message)
-	else
-		print()
-	end
-	term.popColor()
-end
-
 function update_install_cef(version, hash)
 	local filename = "utils/buildactions/install_cef.lua"
 	local f = io.open(filename)
@@ -73,12 +61,14 @@ newaction {
 			local resource, result_str, result_code = http.get("https://cef-builds.spotifycdn.com/index.json")
 			if result_str ~= "OK" or result_code ~= 200 then
 				errormsg(("Could not get page with status code %s: "):format(response_code), result_str)
+				os.exit(1)
 				return
 			end
 
 			local meta, err = json.decode(resource)
 			if err then
 				errormsg("Could not parse json meta data:", err)
+				os.exit(1)
 				return
 			end
 
@@ -108,7 +98,11 @@ newaction {
 		end
 
 		if not os.isdir(CEF_PATH) then
-			os.mkdir(CEF_PATH)
+			if not os.mkdir(CEF_PATH) then
+				errmsg("ERROR: Could not create cef folder")
+				os.exit(1)
+				return
+			end
 		end
 
 		-- Check file hash
@@ -120,9 +114,8 @@ newaction {
 
 		-- Download CEF
 		print("Downloading CEF " .. CEF_VERSION ..  "...")
-		local result_str, response_code = http.download(make_cef_download_url(), archive_path)
-		if result_str ~= "OK" or response_code ~= 200 then
-			errormsg(("Could not download CEF with status code %s: "):format(response_code), result_str)
+		if not http.download_print_errors(make_cef_download_url(), archive_path) then
+			os.exit(1)
 			return
 		end
 
@@ -152,18 +145,40 @@ newaction {
 		end
 
 		-- Delete old CEF files
-		os.rmdir(CEF_PATH)
-		os.mkdir(CEF_PATH)
+		if not os.rmdir(CEF_PATH) then
+			errmsg("ERROR: Could not delete cef folder")
+			os.exit(1)
+			return
+		end
+
+		if not os.mkdir(CEF_PATH) then
+			errmsg("ERROR: Could not create cef folder (2)")
+			os.exit(1)
+			return
+		end
 
 		-- Extract first bz2 and then tar
-		os.extract_archive(archive_path, CEF_PATH, true) -- Extract .tar.bz2 to .tar
-		os.extract_archive(CEF_PATH.."temp.tar", CEF_PATH, true) -- Extract .tar
+		if not os.extract_archive(archive_path, CEF_PATH, true) then -- Extract .tar.bz2 to .tar
+			errmsg("ERROR: Could not extract .tar.bz2")
+			os.exit(1)
+			return
+		end
+
+		if not os.extract_archive(CEF_PATH.."temp.tar", CEF_PATH, true) then -- Extract .tar
+			errmsg("ERROR: Could not extract .tar")
+			os.exit(1)
+			return
+		end
 
 		-- Move all files from cef_binary*/* to ./
 		os.expanddir_wildcard(CEF_PATH.."cef_binary*", CEF_PATH)
 
 		-- Delete .tar archive, but keep .tar.bz2 for checksumming
-		os.remove(CEF_PATH.."temp.tar")
+		if not os.remove(CEF_PATH.."temp.tar") then
+			errmsg("ERROR: Could not remove temp.tar")
+			os.exit(1)
+			return
+		end
 	end
 }
 

utils/buildactions/install_data.lua

@@ -21,41 +21,110 @@ newaction {
 
 	execute = function()
 		-- Make Bin directory if not exists
-		os.mkdir(BIN_DIR)
+		local success, message = os.mkdir(BIN_DIR)
+		if not success then
+			errmsg("ERROR: Couldn't create Bin directory", "\n"..message)
+			os.exit(1)
+			return
+		end
 
 		-- Copy data files
 		if os.host() == "windows" then
-			os.copydir(DATA_DIR, BIN_DIR)
+			local success, message = os.copydir(DATA_DIR, BIN_DIR)
+			if not success then
+				errmsg("ERROR: Couldn't create copy data directory", "\n"..message)
+				os.exit(1)
+				return
+			end
 		end
 
 		-- Copy configs if they don't already exist
-		os.copydir("Server/mods/deathmatch", BIN_DIR.."/server/mods/deathmatch", "*.conf", false, true)
-		os.copydir("Server/mods/deathmatch", BIN_DIR.."/server/mods/deathmatch", "*.xml", false, true)
+		local success, message = os.copydir("Server/mods/deathmatch", BIN_DIR.."/server/mods/deathmatch", "*.conf", false, true)
+		if not success then
+			errmsg("ERROR: Couldn't copy server config files", "\n"..message)
+			os.exit(1)
+			return
+		end
+
+		local success, message = os.copydir("Server/mods/deathmatch", BIN_DIR.."/server/mods/deathmatch", "*.xml", false, true)
+		if not success then
+			errmsg("ERROR: Couldn't copy server xml files", "\n"..message)
+			os.exit(1)
+			return
+		end
 
 		-- Make sure server/x64 directory exists
-		os.mkdir(BIN_DIR.."/server/x64")
+		local success, message = os.mkdir(BIN_DIR.."/server/x64")
+		if not success then
+			errmsg("ERROR: Couldn't create server/x64 directory", "\n"..message)
+			os.exit(1)
+			return
+		end
 
 		if os.host() == "windows" then
-			http.download_print_errors(NET_PATH_X86_WIN, BIN_DIR.."/server/net.dll")
-			http.download_print_errors(NET_PATH_X64_WIN, BIN_DIR.."/server/x64/net.dll")
-			http.download_print_errors(NETC_PATH_WIN, BIN_DIR.."/MTA/netc.dll")
+			local success = http.download_print_errors(NET_PATH_X86_WIN, BIN_DIR.."/server/net.dll")
+			success = success and http.download_print_errors(NET_PATH_X64_WIN, BIN_DIR.."/server/x64/net.dll")
+			success = success and http.download_print_errors(NETC_PATH_WIN, BIN_DIR.."/MTA/netc.dll")
+
+			-- A download failed
+			if not success then
+				os.exit(1)
+				return
+			end
 
-			os.copyfile(BIN_DIR.."/MTA/netc.dll", BIN_DIR.."/MTA/netc_d.dll")
-			os.copyfile(BIN_DIR.."/server/net.dll", BIN_DIR.."/server/net_d.dll")
-			os.copyfile(BIN_DIR.."/server/x64/net.dll", BIN_DIR.."/server/x64/net_d.dll")
+			if not os.copyfile(BIN_DIR.."/MTA/netc.dll", BIN_DIR.."/MTA/netc_d.dll") then
+				errmsg("ERROR: Could not copy netc.dll")
+				os.exit(1)
+				return
+			end
+
+			if not os.copyfile(BIN_DIR.."/server/net.dll", BIN_DIR.."/server/net_d.dll") then
+				errmsg("ERROR: Could not copy server/net.dll")
+				os.exit(1)
+				return
+			end
+
+			if not os.copyfile(BIN_DIR.."/server/x64/net.dll", BIN_DIR.."/server/x64/net_d.dll") then
+				errmsg("ERROR: Could not copy server/x64/net.dll")
+				os.exit(1)
+				return
+			end
 		elseif os.host() == "macosx" then
 			local c = string.char(27)
 			print(string.format("Listen, I ain't leaving here till you tell me where the macOS net builds are.\n       " ..
 				" So come on bub, for old times' sake, huh?\n\t%s[45m%s[37mDid you just call me... BLOB?%s[0m\n", c,c,c,c))
 
-			http.download_print_errors(NET_PATH_X64_MACOS, BIN_DIR.."/server/x64/net.dylib")
-			os.copyfile(BIN_DIR.."/server/x64/net.dylib", BIN_DIR.."/server/x64/net_d.dylib")
+			if not http.download_print_errors(NET_PATH_X64_MACOS, BIN_DIR.."/server/x64/net.dylib") then
+				os.exit(1)
+				return
+			end
+
+			if not os.copyfile(BIN_DIR.."/server/x64/net.dylib", BIN_DIR.."/server/x64/net_d.dylib") then
+				errmsg("ERROR: Could not copy server/x64/net.dylib")
+				os.exit(1)
+				return
+			end
 		else
-			http.download_print_errors(NET_PATH_X86_LINUX, BIN_DIR.."/server/net.so")
-			http.download_print_errors(NET_PATH_X64_LINUX, BIN_DIR.."/server/x64/net.so")
+			local success = http.download_print_errors(NET_PATH_X86_LINUX, BIN_DIR.."/server/net.so")
+			success = success and http.download_print_errors(NET_PATH_X64_LINUX, BIN_DIR.."/server/x64/net.so")
+
+			-- A download failed
+			if not success then
+				os.exit(1)
+				return
+			end
+
+			if not os.copyfile(BIN_DIR.."/server/net.so", BIN_DIR.."/server/net_d.so") then
+				errmsg("ERROR: Could not copy server/net.so")
+				os.exit(1)
+				return
+			end
 
-			os.copyfile(BIN_DIR.."/server/net.so", BIN_DIR.."/server/net_d.so")
-			os.copyfile(BIN_DIR.."/server/x64/net.so", BIN_DIR.."/server/x64/net_d.so")
+			if not os.copyfile(BIN_DIR.."/server/x64/net.so", BIN_DIR.."/server/x64/net_d.so") then
+				errmsg("ERROR: Could not copy server/x64/net.so")
+				os.exit(1)
+				return
+			end
 		end
 	end
 }

utils/buildactions/install_resources.lua

@@ -1,29 +1,35 @@
-premake.modules.install_resources = {}
+require 'utils'
 
-local unzip = function(zip_path, target_path)
-	zip_path = path.translate(zip_path)
-	target_path = path.translate(target_path)
+premake.modules.install_resources = {}
 
-	if os.host() == "windows" then
-		os.executef("call \"utils\\7z\\7za.exe\" x \"%s\" -aoa -o\"%s\"", zip_path, target_path)
-	else
-		os.executef("unzip \"%s\" -d \"%s\"", zip_path, target_path)
-	end
-end
+-- Config variables
+local RESOURCES_URL = "https://mirror.mtasa.com/mtasa/resources/mtasa-resources-latest.zip"
+local EXTRACT_DIR = "Bin/server/mods/deathmatch/resources/"
 
 newaction {
 	trigger = "install_resources",
 	description = "Installs the resources to the bin directory",
 
 	execute = function()
 		-- Download resources
-		http.download("http://mirror.mtasa.com/mtasa/resources/mtasa-resources-latest.zip", "temp_resources.zip")
+		if not http.download_print_errors(RESOURCES_URL, "temp_resources.zip") then
+			os.exit(1)
+			return
+		end
 
 		-- Extract resources
-		unzip("temp_resources.zip", "Bin/server/mods/deathmatch/resources/")
-		
+		if not os.extract_archive("temp_resources.zip", EXTRACT_DIR, true) then
+			errmsg("ERROR: Couldn't unzip resources")
+			os.exit(1)
+			return
+		end
+
 		-- Cleanup
-		os.remove("temp_resources.zip")
+		if not os.remove("temp_resources.zip") then
+			errmsg("ERROR: Couldn't delete downloaded resources zip file")
+			os.exit(1)
+			return
+		end
 	end
 }
 

utils/buildactions/install_unifont.lua

@@ -27,14 +27,17 @@ newaction {
 		-- Download Unifont
 		print("Downloading Unifont...")
 		if not http.download_print_errors(UNIFONT_BASEURL..UNIFONT_TAG.."/"..UNIFONT_DOWNLOAD_FILENAME, archive_path) then
+			os.exit(1)
 			return
 		end
 
 		-- Check downloaded file hash
-		if os.sha256_file(archive_path) ~= UNIFONT_HASH then
-			print("Unifont hash mismatch!")
+		local download_hash = os.sha256_file(archive_path)
+		if download_hash ~= UNIFONT_HASH then
+			errormsg("ERROR: Unifont hash mismatch!", ("\nExpected %s, got %s"):format(UNIFONT_HASH, download_hash))
 			-- Delete bad file
 			os.remove(archive_path)
+			os.exit(1)
 			return
 		end
 

utils/buildactions/utils.lua

@@ -79,8 +79,17 @@ function os.expanddir_wildcard(from, to)
 	if not dir then return end
 
 	-- TODO: Optimize this
-	os.copydir(dir, to)
-	os.rmdir(dir)
+	if not os.copydir(dir, to) then
+		errmsg("ERROR: Couldn't copy directory", ("\nTried to copy %s to %s"):format(dir, to))
+		os.exit(1)
+		return
+	end
+	
+	if not os.rmdir(dir) then
+		errmsg("ERROR: Couldn't remove directory", ("\nTried to remove %s"):format(dir))
+		os.exit(1)
+		return
+	end
 end
 
 function os.sha256_file(path)
@@ -110,21 +119,37 @@ function os.extract_archive(archive_path, target_path, override)
 	local flags = override and "-aoa" or "-aos"
 
 	if os.host() == "windows" then
-		os.executef("call \"utils\\7z\\7za.exe\" x \"%s\" %s -o\"%s\"", archive_path, flags, target_path)
+		return os.executef("call \"utils\\7z\\7za.exe\" x \"%s\" %s -o\"%s\"", archive_path, flags, target_path)
 	else
-		os.executef("7z x \"%s\" %s -o\"%s\"", archive_path, flags, target_path)
+		if not os.executef("7z x \"%s\" %s -o\"%s\"", archive_path, flags, target_path) then
+			return os.executef("unzip \"%s\" -d \"%s\"", archive_path, target_path)
+		end
 	end
+
+	return false
 end
 
 function http.download_print_errors(url, file, options)
 	local result_str, response_code = http.download(url, file, options)
 	if result_str ~= "OK" then
-		print( "\nERROR: Failed to download " .. url .. "\n" .. result_str .. " (" .. response_code .. ")" )
+		errormsg("ERROR: Download failed", "\nFailed to download " .. url .. "\n" .. result_str .. " (" .. response_code .. ")" )
 		if response_code == 0 then
 			-- No response code means server was unreachable
-			print( "Check premake5 is not blocked by firewall rules" )
+			errormsg("NOTICE: Server was unreachable", "\nCheck server address is correct and that premake5 is not blocked by firewall rules")
 		end
 		return false
 	end
 	return true
 end
+
+function errormsg(title, message)
+	term.pushColor(term.red)
+	io.write(title)
+	if message then
+		term.setTextColor(term.purple)
+		print(" " .. message)
+	else
+		print()
+	end
+	term.popColor()
+end