final changes before rp3 (i promise)

Rectify11 · Dec 23, 2022 · 845e187 · 845e187
1 parent 1d1a1e3
commit 845e187
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/Rectify11Installer/Core/Installer.cs b/Rectify11Installer/Core/Installer.cs
@@ -278,6 +278,7 @@ public async Task<bool> Install(frmWizard frm)
 				File.Delete(Path.Combine(Variables.r11Folder, "files.7z"));
 				File.Delete(Path.Combine(Variables.r11Folder, "vcredist32.exe"));
 				File.Delete(Path.Combine(Variables.r11Folder, "vcredist64.exe"));
+				File.Delete(Path.Combine(Variables.r11Folder, "newfiles.txt"));
 				try
 				{
 					Directory.Delete(Path.Combine(Variables.r11Folder, "themes"), true);

diff --git a/Rectify11Installer/Pages/InstallOptnsPage.cs b/Rectify11Installer/Pages/InstallOptnsPage.cs
@@ -24,6 +24,26 @@ void Application_Idle(object sender, System.EventArgs e)
         {
             if (!idleinit)
             {
+                if (Directory.Exists(Path.Combine(Variables.r11Folder, "Backup")))
+                {
+                    File.WriteAllText(Path.Combine(Variables.r11Folder, "newfiles.txt"), Properties.Resources.newfiles);
+                    if (!Directory.Exists(Path.Combine(Variables.r11Folder, "Backup", "oldfiles")))
+                    {
+                        Directory.CreateDirectory(Path.Combine(Variables.r11Folder, "Backup", "oldfiles"));
+                    }
+                    string[] newFiles = File.ReadAllLines(Path.Combine(Variables.r11Folder, "newfiles.txt"));
+                    foreach (string file in newFiles)
+                    {
+                        if (File.Exists(Path.Combine(Variables.r11Folder, "Backup", "oldfiles", file)))
+                        {
+                            File.Delete(Path.Combine(Variables.r11Folder, "Backup", "oldfiles", file));
+                        }
+                        if (File.Exists(Path.Combine(Variables.r11Folder, "Backup", file)))
+                        {
+                            File.Move(Path.Combine(Variables.r11Folder, "Backup", file), Path.Combine(Variables.r11Folder, "Backup", "oldfiles", file));
+                        }
+                    }
+                }
                 Patches list = PatchesParser.GetAll();
                 PatchesPatch[] ok = list.Items;
                 var basicNode = treeView1.Nodes[0].Nodes[0];

diff --git a/Rectify11Installer/Program.cs b/Rectify11Installer/Program.cs
@@ -46,17 +46,6 @@ private static void Main()
 			Application.SetCompatibleTextRenderingDefault(false);
 			//Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("ko");
 			Thread.CurrentThread.CurrentUICulture = CultureInfo.CurrentUICulture;
-			if (Directory.Exists(Path.Combine(Variables.r11Folder, "Backup")))
-			{
-				string[] newFiles = File.ReadAllLines(Properties.Resources.newfiles);
-				foreach (string file in newFiles)
-				{
-					if (File.Exists(Path.Combine(Variables.r11Folder, "Backup", file)))
-                    {
-						File.Move(Path.Combine(Variables.r11Folder, "Backup", file), Path.Combine(Variables.r11Folder, "Backup", file + "_old"));
-                    }
-				}
-			}
 			Application.Run(new frmWizard());
 		}
 	}

diff --git a/Rectify11Installer/Resources/files.7z b/Rectify11Installer/Resources/files.7z