SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Proper support for user profile folder renaming

Browse Source
This commit is contained in:
pizzaboxer 2024-08-10 16:41:20 +01:00
parent efc7a881e1
commit 39bb334b9a
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
1 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Bloxstrap/App.xaml.cs
View File

@ -117,30 +117,43 @@ namespace Bloxstrap
// installation check begins here // installation check begins here
using var uninstallKey = Registry.CurrentUser.OpenSubKey(UninstallKey); using var uninstallKey = Registry.CurrentUser.OpenSubKey(UninstallKey);
string? installLocation = null; string? installLocation = null;
bool fixInstallLocation = false;
if (uninstallKey?.GetValue("InstallLocation") is string value && Directory.Exists(value)) if (uninstallKey?.GetValue("InstallLocation") is string value)
installLocation = value; {
if (Directory.Exists(value))
{
installLocation = value;
}
else
{
// check if user profile folder has been renamed
// honestly, i'll be expecting bugs from this
var match = Regex.Match(value, @"^[a-zA-Z]:\\Users\\([^\\]+)", RegexOptions.IgnoreCase);
if (match.Success)
{
string newLocation = value.Replace(match.Value, Paths.UserProfile, StringComparison.InvariantCultureIgnoreCase);
if (Directory.Exists(newLocation))
{
installLocation = newLocation;
fixInstallLocation = true;
}
}
}
}
// silently change install location if we detect a portable run // silently change install location if we detect a portable run
// this should also handle renaming of the user profile folder
if (installLocation is null && Directory.GetParent(Paths.Process)?.FullName is string processDir) if (installLocation is null && Directory.GetParent(Paths.Process)?.FullName is string processDir)
{ {
var files = Directory.GetFiles(processDir).Select(x => Path.GetFileName(x)).ToArray(); var files = Directory.GetFiles(processDir).Select(x => Path.GetFileName(x)).ToArray();
var installer = new Installer
{
InstallLocation = processDir,
IsImplicitInstall = true
};
// check if settings.json and state.json are the only files in the folder, and if we can write to it // check if settings.json and state.json are the only files in the folder
if (files.Length <= 3 if (files.Length <= 3 && files.Contains("Settings.json") && files.Contains("State.json"))
&& files.Contains("Settings.json")
&& files.Contains("State.json")
&& installer.CheckInstallLocation())
{ {
Logger.WriteLine(LOG_IDENT, $"Changing install location to '{processDir}'");
installer.DoInstall();
installLocation = processDir; installLocation = processDir;
fixInstallLocation = true;
} }
} }
@ -151,6 +164,21 @@ namespace Bloxstrap
} }
else else
{ {
if (fixInstallLocation)
{
var installer = new Installer
{
InstallLocation = installLocation,
IsImplicitInstall = true
};
if (installer.CheckInstallLocation())
{
Logger.WriteLine(LOG_IDENT, $"Changing install location to '{installLocation}'");
installer.DoInstall();
}
}
Paths.Initialize(installLocation); Paths.Initialize(installLocation);
// ensure executable is in the install directory // ensure executable is in the install directory