Fix an edge case where the launcher can fail to repair itself due to the gitlab barrier getting in the way of attempts to download the latest launcher version

Author: ConnorForan

include/self_updater/launcher_update_manager.h

@@ -15,7 +15,7 @@ namespace Updater {
 	public:
 		static constexpr const size_t BUFF_SIZE = 4096;
 
-		SelfUpdateCheckResult CheckSelfUpdateAvailability(bool allowPreRelease, std::string& version, std::string& url);
+		SelfUpdateCheckResult CheckSelfUpdateAvailability(bool allowPreRelease, bool force, std::string& version, std::string& url);
 		bool DownloadUpdate(const std::string& url, std::string& zipFilename);
 
 	private:

self_updater/launcher_update_manager.cpp

@@ -213,12 +213,12 @@ namespace Updater {
 		Logger::Info("%s: %s\n", prefix, curl::DownloadAsStringResultToLogString(result));
 	}
 
-	LauncherUpdateManager::SelfUpdateCheckResult LauncherUpdateManager::CheckSelfUpdateAvailability(bool allowPreReleases,
+	LauncherUpdateManager::SelfUpdateCheckResult LauncherUpdateManager::CheckSelfUpdateAvailability(bool allowPreReleases, bool force,
 		std::string& version, std::string& url) {
 		Logger::Info("Checking for availability of launcher updates...\n");
 		curl::DownloadStringResult downloadReleasesResult;
 		Shared::SteamLauncherUpdateStatus steamUpdateStatus;
-		if (_updateChecker.IsSelfUpdateAvailable(allowPreReleases, false, version, url, downloadReleasesResult, steamUpdateStatus)) {
+		if (_updateChecker.IsSelfUpdateAvailable(allowPreReleases, force, version, url, downloadReleasesResult, steamUpdateStatus)) {
 			Logger::Info("...OK\n");
 			Logger::Info("New version of the launcher available: %s (can be downloaded from %s)\n", version.c_str(), url.c_str());
 			return SELF_UPDATE_CHECK_UPDATE_AVAILABLE;

self_updater/self_updater.cpp

@@ -470,15 +470,15 @@ Updater::UpdateLauncherResult Updater::TryUpdateLauncher(int argc, char** argv,
 		version = versionGiven;
 	}
 
-	const bool launcherMissing = !std::filesystem::exists(LauncherDllPath);
-	const bool skipConfirmation = urlGiven || launcherMissing;
+	const bool forceUpdate = !std::filesystem::exists(LauncherDllPath);
+	const bool skipConfirmation = urlGiven || forceUpdate;
 
 	if (!urlGiven) {
-		lu::SelfUpdateCheckResult checkResult = updateManager.CheckSelfUpdateAvailability(allowUnstable, version, url);
+		lu::SelfUpdateCheckResult checkResult = updateManager.CheckSelfUpdateAvailability(allowUnstable, forceUpdate, version, url);
 
 		switch (checkResult) {
 		case lu::SELF_UPDATE_CHECK_UP_TO_DATE:
-			if (launcherMissing) {
+			if (forceUpdate) {
 				Logger::Warn("Launcher DLL missing. Forcing update to version: %s (from %s)\n", version.c_str(), url.c_str());
 			} else {
 				Logger::Info("launcher is already up-to-date.\n");

src/isaac_installation.cpp

@@ -357,7 +357,7 @@ static bool RemoveOldPatchFolder()
 		try {
 			fs::remove_all(__patchFolder);
 		} catch (std::filesystem::filesystem_error& err) {
-			Logger::Error("Failed to delete patch folder: %s (attempt #%d)", err.what(), attempts);
+			Logger::Error("Failed to delete patch folder: %s (attempt #%d)\n", err.what(), attempts);
 			std::this_thread::sleep_for(std::chrono::milliseconds(200));
 		}
 	}
@@ -447,7 +447,6 @@ bool InstallationData::PatchIsAvailable(const bool skipOnlineCheck) {
 
 	if (result == HASH_OK) {
 		fs::path fullPath = fs::current_path() / __patchFolder / "exehash.txt";
-		std::string s = fullPath.string();
 		if (fs::exists(fullPath)) {
             // Read the exe hash and compare it.
             std::stringstream buffer;

src/standalone_rgon_folder.cpp

@@ -1339,7 +1339,7 @@ namespace standalone_rgon {
                      */
                     if (!Filesystem::Exists(sourceStr)) {
                         Logger::Warn("standalone_rgon::CopyFiles: skipping %s as "
-                            "the source file does not exist", sourceStr);
+                            "the source file does not exist\n", sourceStr);
                         continue;
                     }