From 735e7bf533618abeb044e0f0c64467955d4787eb Mon Sep 17 00:00:00 2001 From: pizzaboxer <41478239+pizzaboxer@users.noreply.github.com> Date: Fri, 27 Jan 2023 20:05:25 +0000 Subject: [PATCH] Fix project name string referencing --- Bloxstrap/Bootstrapper.cs | 30 +++++++++++++++--------------- Bloxstrap/Helpers/Directories.cs | 6 +++--- Bloxstrap/Helpers/Updater.cs | 8 ++++---- Bloxstrap/MainWindow.xaml | 12 ------------ Bloxstrap/MainWindow.xaml.cs | 28 ---------------------------- 5 files changed, 22 insertions(+), 62 deletions(-) delete mode 100644 Bloxstrap/MainWindow.xaml delete mode 100644 Bloxstrap/MainWindow.xaml.cs diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 90afade..244c251 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -131,14 +131,14 @@ namespace Bloxstrap private async Task CheckForUpdates() { - string currentVersion = $"Bloxstrap v{App.Version}"; + string currentVersion = $"{App.ProjectName} v{App.Version}"; var releaseInfo = await Utilities.GetJson($"https://api.github.com/repos/{App.ProjectRepository}/releases/latest"); if (releaseInfo is null || releaseInfo.Name is null || releaseInfo.Assets is null || currentVersion == releaseInfo.Name) return; - Dialog.Message = "Getting the latest Bloxstrap..."; + Dialog.Message = $"Getting the latest {App.ProjectName}..."; // 64-bit is always the first option GithubReleaseAsset asset = releaseInfo.Assets[Environment.Is64BitOperatingSystem ? 0 : 1]; @@ -335,7 +335,7 @@ namespace Bloxstrap // set uninstall key RegistryKey uninstallKey = Registry.CurrentUser.CreateSubKey($@"Software\Microsoft\Windows\CurrentVersion\Uninstall\{App.ProjectName}"); - uninstallKey.SetValue("DisplayIcon", $"{Directories.App},0"); + uninstallKey.SetValue("DisplayIcon", $"{Directories.Application},0"); uninstallKey.SetValue("DisplayName", App.ProjectName); uninstallKey.SetValue("DisplayVersion", App.Version); @@ -345,9 +345,9 @@ namespace Bloxstrap uninstallKey.SetValue("InstallLocation", Directories.Base); uninstallKey.SetValue("NoRepair", 1); uninstallKey.SetValue("Publisher", "pizzaboxer"); - uninstallKey.SetValue("ModifyPath", $"\"{Directories.App}\" -preferences"); - uninstallKey.SetValue("QuietUninstallString", $"\"{Directories.App}\" -uninstall -quiet"); - uninstallKey.SetValue("UninstallString", $"\"{Directories.App}\" -uninstall"); + uninstallKey.SetValue("ModifyPath", $"\"{Directories.Application}\" -preferences"); + uninstallKey.SetValue("QuietUninstallString", $"\"{Directories.Application}\" -uninstall -quiet"); + uninstallKey.SetValue("UninstallString", $"\"{Directories.Application}\" -uninstall"); uninstallKey.SetValue("URLInfoAbout", $"https://github.com/{App.ProjectRepository}"); uninstallKey.SetValue("URLUpdateInfo", $"https://github.com/{App.ProjectRepository}/releases/latest"); uninstallKey.Close(); @@ -359,16 +359,16 @@ namespace Bloxstrap // this doesn't go under register, so we check every launch // just in case the stock bootstrapper changes it back - Protocol.Register("roblox", "Roblox", Directories.App); - Protocol.Register("roblox-player", "Roblox", Directories.App); + Protocol.Register("roblox", "Roblox", Directories.Application); + Protocol.Register("roblox-player", "Roblox", Directories.Application); // in case the user is reinstalling - if (File.Exists(Directories.App) && App.IsFirstRun) - File.Delete(Directories.App); + if (File.Exists(Directories.Application) && App.IsFirstRun) + File.Delete(Directories.Application); // check to make sure bootstrapper is in the install folder - if (!File.Exists(Directories.App) && Environment.ProcessPath is not null) - File.Copy(Environment.ProcessPath, Directories.App); + if (!File.Exists(Directories.Application) && Environment.ProcessPath is not null) + File.Copy(Environment.ProcessPath, Directories.Application); // this SHOULD go under Register(), // but then people who have Bloxstrap v1.0.0 installed won't have this without a reinstall @@ -377,16 +377,16 @@ namespace Bloxstrap { Directory.CreateDirectory(Directories.StartMenu); - ShellLink.Shortcut.CreateShortcut(Directories.App, "", Directories.App, 0) + ShellLink.Shortcut.CreateShortcut(Directories.Application, "", Directories.Application, 0) .WriteToFile(Path.Combine(Directories.StartMenu, "Play Roblox.lnk")); - ShellLink.Shortcut.CreateShortcut(Directories.App, "-preferences", Directories.App, 0) + ShellLink.Shortcut.CreateShortcut(Directories.Application, "-preferences", Directories.Application, 0) .WriteToFile(Path.Combine(Directories.StartMenu, $"Configure {App.ProjectName}.lnk")); } if (App.Settings.CreateDesktopIcon && !File.Exists(Path.Combine(Directories.Desktop, "Play Roblox.lnk"))) { - ShellLink.Shortcut.CreateShortcut(Directories.App, "", Directories.App, 0) + ShellLink.Shortcut.CreateShortcut(Directories.Application, "", Directories.Application, 0) .WriteToFile(Path.Combine(Directories.Desktop, "Play Roblox.lnk")); } } diff --git a/Bloxstrap/Helpers/Directories.cs b/Bloxstrap/Helpers/Directories.cs index 9af0938..73dd709 100644 --- a/Bloxstrap/Helpers/Directories.cs +++ b/Bloxstrap/Helpers/Directories.cs @@ -9,7 +9,7 @@ namespace Bloxstrap.Helpers // so these can safely be called before initialization public static string LocalAppData { get => Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); } public static string Desktop { get => Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory); } - public static string StartMenu { get => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Programs", "Bloxstrap"); } + public static string StartMenu { get => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Programs", App.ProjectName); } public static string Base { get; private set; } = ""; public static string Downloads { get; private set; } = ""; @@ -19,7 +19,7 @@ namespace Bloxstrap.Helpers public static string Updates { get; private set; } = ""; public static string ReShade { get; private set; } = ""; - public static string App { get; private set; } = ""; + public static string Application { get; private set; } = ""; public static bool Initialized { get => String.IsNullOrEmpty(Base); } @@ -33,7 +33,7 @@ namespace Bloxstrap.Helpers Updates = Path.Combine(Base, "Updates"); ReShade = Path.Combine(Base, "ReShade"); - App = Path.Combine(Base, $"{"Bloxstrap"}.exe"); + Application = Path.Combine(Base, $"{App.ProjectName}.exe"); } } } diff --git a/Bloxstrap/Helpers/Updater.cs b/Bloxstrap/Helpers/Updater.cs index 38f5280..1eee9d9 100644 --- a/Bloxstrap/Helpers/Updater.cs +++ b/Bloxstrap/Helpers/Updater.cs @@ -11,14 +11,14 @@ namespace Bloxstrap.Helpers { public static void CheckInstalledVersion() { - if (Environment.ProcessPath is null || !File.Exists(Directories.App) || Environment.ProcessPath == Directories.App) + if (Environment.ProcessPath is null || !File.Exists(Directories.Application) || Environment.ProcessPath == Directories.Application) return; bool isAutoUpgrade = Environment.ProcessPath.StartsWith(Directories.Updates); // if downloaded version doesn't match, replace installed version with downloaded version FileVersionInfo currentVersionInfo = FileVersionInfo.GetVersionInfo(Environment.ProcessPath); - FileVersionInfo installedVersionInfo = FileVersionInfo.GetVersionInfo(Directories.App); + FileVersionInfo installedVersionInfo = FileVersionInfo.GetVersionInfo(Directories.Application); if (installedVersionInfo.ProductVersion == currentVersionInfo.ProductVersion) return; @@ -44,8 +44,8 @@ namespace Bloxstrap.Helpers if (result != MessageBoxResult.Yes) return; - File.Delete(Directories.App); - File.Copy(Environment.ProcessPath, Directories.App); + File.Delete(Directories.Application); + File.Copy(Environment.ProcessPath, Directories.Application); Bootstrapper.Register(); diff --git a/Bloxstrap/MainWindow.xaml b/Bloxstrap/MainWindow.xaml deleted file mode 100644 index af8a6e6..0000000 --- a/Bloxstrap/MainWindow.xaml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/Bloxstrap/MainWindow.xaml.cs b/Bloxstrap/MainWindow.xaml.cs deleted file mode 100644 index b16887f..0000000 --- a/Bloxstrap/MainWindow.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Bloxstrap -{ - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : Window - { - public MainWindow() - { - InitializeComponent(); - } - } -}