Merge pull request #1332 from qaisjp/feature/cef-upgrade-script

Add cef upgrade script

Author: qaisjp

utils/buildactions/install_cef.lua

@@ -9,19 +9,86 @@ local CEF_URL_SUFFIX = "_windows32_minimal.tar.bz2"
 
 -- Change here to update CEF version
 local CEF_VERSION = "80.0.4+g74f7b0c+chromium-80.0.3987.122"
-local CEF_HASH = "8FD8E24AF196F00FEAAA1553496BAE99D8196BA023D0DD0FE44EFEEE93B04DFC"
+local CEF_HASH = "8fd8e24af196f00feaaa1553496bae99d8196ba023d0dd0fe44efeee93b04dfc"
 
 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)
+	local text = f:read("*all")
+	f:close()
+
+	-- Replace version and hash lines
+	local version_line = 'local CEF_VERSION = "' .. version .. '"'
+	local hash_line = 'local CEF_HASH = "' .. hash .. '"'
+	text = text:gsub('local CEF_VERSION = ".-"', version_line, 1)
+	text = text:gsub('local CEF_HASH = ".-"', hash_line, 1)
+
+	local f = io.open(filename, "w")
+	f:write(text)
+	f:close()
+end
+
 newaction {
 	trigger = "install_cef",
 	description = "Downloads and installs CEF",
 
-	execute = function()
-		-- Only execute on Windows
-		if os.host() ~= "windows" then return end
+	execute = function(...)
+		local upgrade = #_ARGS == 1 and _ARGS[1] == "upgrade"
+		if upgrade then
+			print("Checking opensource.spotify.com for an update...")
+			resource, result_str, result_code = http.get("http://opensource.spotify.com/cefbuilds/index.html")
+			if result_str ~= "OK" or result_code ~= 200 then
+				errormsg(("Could not get page with status code %s: "):format(response_code), result_str)
+				return
+			end
+
+			local _, index = resource:find('Windows 32%-bit Builds.-data%-version="')
+			if not index then
+				errormsg("Could not find version string index.")
+				return
+			end
+
+			local version = resource:match("(.-)\">", index+1)
+			if not version then
+				errormsg("Could not get version string from index.")
+			end
+
+			if version == CEF_VERSION then
+				print(("CEF is already up to date (%s)"):format(version))
+				return
+			end
+
+			io.write(("Does version '%s' look OK to you? (Y/n) "):format(version))
+			local input = io.read():lower()
+			if not (input == "y" or input == "yes") then
+				errormsg("Aborting due to user request.")
+				return
+			end
+
+			CEF_VERSION = version
+			CEF_HASH = ""
+		end
+
+		-- Only execute on Windows in normal scenarios
+		if os.host() ~= "windows" and not upgrade then
+			return
+		end
 
 		-- Check file hash
 		local archive_path = CEF_PATH.."temp.tar.bz2"
@@ -33,12 +100,33 @@ newaction {
 		-- Download CEF
 		print("Downloading CEF...")
 		local result_str, response_code = http.download(make_cef_download_url(), archive_path)
-		if result_str ~= "OK" and response_code ~= 200 then
-			term.pushColor(term.red)
-			io.write(("Could not download CEF with status code %d: "):format(response_code))
-			term.setTextColor(term.purple)
-			print(result_str)
-			term.popColor()
+		if result_str ~= "OK" or response_code ~= 200 then
+			errormsg(("Could not download CEF with status code %s: "):format(response_code), result_str)
+			return
+		end
+
+		local downloaded_hash = os.sha256_file(archive_path)
+		if upgrade then
+			print("New CEF hash is:", downloaded_hash)
+			CEF_HASH = downloaded_hash
+
+			io.write(("Update `install_cef.lua` file? (Y/n) "):format(version))
+			local input = io.read():lower()
+			if (input == "y" or input == "yes") then
+				update_install_cef(CEF_VERSION, downloaded_hash)
+			end
+		end
+
+		if downloaded_hash == CEF_HASH then
+			print("CEF consistency checks succeeded")
+		else
+			errormsg("CEF consistency checks failed.", ("Expected %s, got %s"):format(CEF_HASH, downloaded_hash))
+			os.exit(1)
+			return
+		end
+
+		-- Seriously abort now if we're not using Windows
+		if os.host() ~= "windows" then
 			return
 		end
 

utils/buildactions/install_discord.lua

@@ -9,7 +9,7 @@ local DISCORD_VENDOR = "vendor/discordgsdk"
 
 -- Change these to update the version
 local DISCORD_TAG = "v2020-11-02_21-48-56"
-local DISCORD_HASH = "4CCEEED0D8B41BDC67C44A6DDCCCF42288AF933E1F7284C591327178C391AA39"
+local DISCORD_HASH = "4cceeed0d8b41bdc67c44a6ddcccf42288af933e1f7284c591327178c391aa39"
 
 newaction {
 	trigger = "install_discord",

utils/buildactions/utils.lua

@@ -84,12 +84,26 @@ function os.expanddir_wildcard(from, to)
 end
 
 function os.sha256_file(path)
-	if os.host() == "windows" then
-		local s, errc = os.outputof(string.format("powershell -Command (Get-FileHash \"%s\" -Algorithm SHA256).Hash", path))
-		return (errc == 0) and s or ""
+	local windows = os.host() == "windows"
+	local s, errc
+	if windows then
+		s, errc = os.outputof(string.format("CertUtil -hashfile \"%s\" SHA256", path))
 	else
-		return os.outputof(string.format("sha256sum \"%s\" | awk '{ print $1 }'", path))
+		s, errc = os.outputof(string.format("sha256sum \"%s\" | awk '{ print $1 }'", path))
+	end
+
+	-- Check for error
+	if errc ~= 0 then
+		print("Error os.sha256_file: ", errc)
+		return ""
 	end
+
+	-- Clean windows output
+	if windows then
+		s = (s:match("\n(.*)\n(.*)") or ""):gsub(" ", "")
+	end
+
+	return s:lower()
 end
 
 function os.extract_archive(archive_path, target_path, override)