always copy to the installer path

This commit is contained in:
bluepilledgreat 2025-04-05 19:27:17 +01:00
parent ab8eb3cef3
commit 1f59d29994

View File

@ -168,39 +168,28 @@ namespace Bloxstrap
App.Terminate(ErrorCode.ERROR_CANCELLED); App.Terminate(ErrorCode.ERROR_CANCELLED);
} }
private void HandlePrivateChannelLaunch() private void CopyBloxstrapToRobloxLocation()
{ {
const string LOG_IDENT = "Bootstrapper::HandlePrivateChannelLaunch"; const string LOG_IDENT = "Bootstrapper::CopyBloxstrapToRobloxLocation";
string path = Path.Combine(_latestVersionDirectory, AppData.RobloxInstallerExecutableName); string path = Path.Combine(_latestVersionDirectory, AppData.RobloxInstallerExecutableName);
if (Deployment.PrivateChannel) if (File.Exists(path))
{ {
if (File.Exists(path)) string versionCopyHash = MD5Hash.FromFile(path);
{ string processHash = MD5Hash.FromFile(Paths.Process);
string versionCopyHash = MD5Hash.FromFile(path);
string processHash = MD5Hash.FromFile(Paths.Process);
if (versionCopyHash != processHash) if (versionCopyHash != processHash)
{
App.Logger.WriteLine(LOG_IDENT, $"Installer in version directory is not the same as the current process ({versionCopyHash} =/= {processHash})");
App.Logger.WriteLine(LOG_IDENT, "Copying...");
File.Copy(Paths.Process, path, true);
}
}
else
{ {
App.Logger.WriteLine(LOG_IDENT, $"Copying Bloxstrap into the installation folder as {AppData.RobloxInstallerExecutableName}"); App.Logger.WriteLine(LOG_IDENT, $"Installer in version directory is not the same as the current process ({versionCopyHash} =/= {processHash})");
App.Logger.WriteLine(LOG_IDENT, "There is a spy among us..."); App.Logger.WriteLine(LOG_IDENT, "Copying...");
File.Copy(Paths.Process, path); File.Copy(Paths.Process, path, true);
} }
} }
else else
{ {
if (File.Exists(path)) App.Logger.WriteLine(LOG_IDENT, $"Copying Bloxstrap into the installation folder as {AppData.RobloxInstallerExecutableName}");
{ App.Logger.WriteLine(LOG_IDENT, "There is a spy among us...");
App.Logger.WriteLine(LOG_IDENT, $"Deleting {AppData.RobloxInstallerExecutableName} from the version directory"); File.Copy(Paths.Process, path);
File.Delete(path);
}
} }
} }
@ -320,7 +309,7 @@ namespace Bloxstrap
allModificationsApplied = await ApplyModifications(); allModificationsApplied = await ApplyModifications();
} }
HandlePrivateChannelLaunch(); CopyBloxstrapToRobloxLocation();
// check registry entries for every launch, just in case the stock bootstrapper changes it back // check registry entries for every launch, just in case the stock bootstrapper changes it back