Addendum to a634720: Fix typo

Author: patrikjuvonen

utils/buildactions/install_cef.lua

@@ -99,7 +99,7 @@ newaction {
 
 		if not os.isdir(CEF_PATH) then
 			if not os.mkdir(CEF_PATH) then
-				errmsg("ERROR: Could not create cef folder")
+				errormsg("ERROR: Could not create cef folder")
 				os.exit(1)
 				return
 			end
@@ -146,26 +146,26 @@ newaction {
 
 		-- Delete old CEF files
 		if not os.rmdir(CEF_PATH) then
-			errmsg("ERROR: Could not delete cef folder")
+			errormsg("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)")
+			errormsg("ERROR: Could not create cef folder (2)")
 			os.exit(1)
 			return
 		end
 
 		-- Extract first bz2 and then tar
 		if not os.extract_archive(archive_path, CEF_PATH, true) then -- Extract .tar.bz2 to .tar
-			errmsg("ERROR: Could not extract .tar.bz2")
+			errormsg("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")
+			errormsg("ERROR: Could not extract .tar")
 			os.exit(1)
 			return
 		end
@@ -175,7 +175,7 @@ newaction {
 
 		-- Delete .tar archive, but keep .tar.bz2 for checksumming
 		if not os.remove(CEF_PATH.."temp.tar") then
-			errmsg("ERROR: Could not remove temp.tar")
+			errormsg("ERROR: Could not remove temp.tar")
 			os.exit(1)
 			return
 		end

utils/buildactions/install_data.lua

@@ -23,7 +23,7 @@ newaction {
 		-- Make Bin directory if not exists
 		local success, message = os.mkdir(BIN_DIR)
 		if not success then
-			errmsg("ERROR: Couldn't create Bin directory", "\n"..message)
+			errormsg("ERROR: Couldn't create Bin directory", "\n"..message)
 			os.exit(1)
 			return
 		end
@@ -32,7 +32,7 @@ newaction {
 		if os.host() == "windows" then
 			local success, message = os.copydir(DATA_DIR, BIN_DIR)
 			if not success then
-				errmsg("ERROR: Couldn't create copy data directory", "\n"..message)
+				errormsg("ERROR: Couldn't create copy data directory", "\n"..message)
 				os.exit(1)
 				return
 			end
@@ -41,22 +41,22 @@ newaction {
 		-- Copy configs if they don't already exist
 		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)
+			errormsg("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)
+			errormsg("ERROR: Couldn't copy server xml files", "\n"..message)
 			os.exit(1)
 			return
 		end
 
 		-- Make sure server/x64 directory exists
 		local success, message = os.mkdir(BIN_DIR.."/server/x64")
 		if not success then
-			errmsg("ERROR: Couldn't create server/x64 directory", "\n"..message)
+			errormsg("ERROR: Couldn't create server/x64 directory", "\n"..message)
 			os.exit(1)
 			return
 		end
@@ -73,19 +73,19 @@ newaction {
 			end
 
 			if not os.copyfile(BIN_DIR.."/MTA/netc.dll", BIN_DIR.."/MTA/netc_d.dll") then
-				errmsg("ERROR: Could not copy netc.dll")
+				errormsg("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")
+				errormsg("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")
+				errormsg("ERROR: Could not copy server/x64/net.dll")
 				os.exit(1)
 				return
 			end
@@ -100,7 +100,7 @@ newaction {
 			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")
+				errormsg("ERROR: Could not copy server/x64/net.dylib")
 				os.exit(1)
 				return
 			end
@@ -115,13 +115,13 @@ newaction {
 			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")
+				errormsg("ERROR: Could not copy server/net.so")
 				os.exit(1)
 				return
 			end
 
 			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")
+				errormsg("ERROR: Could not copy server/x64/net.so")
 				os.exit(1)
 				return
 			end

utils/buildactions/install_resources.lua

@@ -19,14 +19,14 @@ newaction {
 
 		-- Extract resources
 		if not os.extract_archive("temp_resources.zip", EXTRACT_DIR, true) then
-			errmsg("ERROR: Couldn't unzip resources")
+			errormsg("ERROR: Couldn't unzip resources")
 			os.exit(1)
 			return
 		end
 
 		-- Cleanup
 		if not os.remove("temp_resources.zip") then
-			errmsg("ERROR: Couldn't delete downloaded resources zip file")
+			errormsg("ERROR: Couldn't delete downloaded resources zip file")
 			os.exit(1)
 			return
 		end

utils/buildactions/utils.lua

@@ -80,13 +80,13 @@ function os.expanddir_wildcard(from, to)
 
 	-- TODO: Optimize this
 	if not os.copydir(dir, to) then
-		errmsg("ERROR: Couldn't copy directory", ("\nTried to copy %s to %s"):format(dir, to))
+		errormsg("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))
+		errormsg("ERROR: Couldn't remove directory", ("\nTried to remove %s"):format(dir))
 		os.exit(1)
 		return
 	end