From c71c2b1f5f404e36872b07eb862d339f36865e5b Mon Sep 17 00:00:00 2001
From: pizzaboxer <41478239+pizzaboxer@users.noreply.github.com>
Date: Fri, 2 Sep 2022 17:26:19 +0100
Subject: [PATCH] Add ZFeatureHarmony and fix installation exception
- Added ZFeatureHarmony as a selectable channel
- Fixed a bug where updating Roblox would cause an exception when upgrading Bloxstrap versions (#12)
---
Bloxstrap/Bloxstrap.csproj | 4 ++--
Bloxstrap/Bootstrapper.cs | 6 ++++--
Bloxstrap/Helpers/DeployManager.cs | 2 ++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj
index 0f97dbb3..939e64b9 100644
--- a/Bloxstrap/Bloxstrap.csproj
+++ b/Bloxstrap/Bloxstrap.csproj
@@ -9,8 +9,8 @@
AnyCPU
AnyCPU;x86
Bloxstrap.ico
- 1.4.1
- 1.4.1.0
+ 1.4.2
+ 1.4.2.0
diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
index df19c1ad..269dd3cd 100644
--- a/Bloxstrap/Bootstrapper.cs
+++ b/Bloxstrap/Bootstrapper.cs
@@ -435,10 +435,12 @@ private async Task InstallLatestVersion()
File.Delete(filename);
}
- if (VersionGuid != Program.Settings.VersionGuid)
+ string oldVersionFolder = Path.Combine(Directories.Versions, Program.Settings.VersionGuid);
+
+ if (VersionGuid != Program.Settings.VersionGuid && Directory.Exists(oldVersionFolder))
{
// and also to delete our old version folder
- Directory.Delete(Path.Combine(Directories.Versions, Program.Settings.VersionGuid), true);
+ Directory.Delete(oldVersionFolder, true);
}
}
diff --git a/Bloxstrap/Helpers/DeployManager.cs b/Bloxstrap/Helpers/DeployManager.cs
index 54d291c5..f67018d8 100644
--- a/Bloxstrap/Helpers/DeployManager.cs
+++ b/Bloxstrap/Helpers/DeployManager.cs
@@ -17,6 +17,7 @@ public class DeployManager
"LIVE",
"ZAvatarTeam",
"ZCanary",
+ "ZFeatureHarmony",
"ZIntegration",
"ZLive",
"ZNext",
@@ -43,6 +44,7 @@ public class DeployManager
"ZFeatureBoost_Removal_Test_In_Prod",
"ZFeatureFMOD-20115",
"ZFeatureFMOD-Recording-Test",
+ "ZFeatureHarmony",
"ZFeatureHSR2CDNPlayTest",
"ZFeatureHSR2CDNPlayTest2",
"ZFeatureInstance-Parent-Weak-Ptr",