fixes

Rectify11 · Jan 5, 2024 · b926183 · b926183
1 parent 73ab29d
commit b926183
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,5 +21,5 @@ Rectify11.Phase2.exe
 *.exe
 x64/
 /Rectify11Installer/Resources/Rectify11CPL.dll
-Rectify11Installer/*.7z
+Rectify11Installer/Resources/*.7z
 *.tmp
diff --git a/Rectify11Installer/Core/Backend/Icons.cs b/Rectify11Installer/Core/Backend/Icons.cs
@@ -35,17 +35,6 @@ public static bool Install(FrmWizard frm)
             {
                 Logger.WriteLine("Installing icons");
                 Logger.WriteLine("────────────────");
-                // extract files, delete if folder exists
-                frm.InstallerProgress = "Extracting files...";
-                Helper.SafeDirectoryDeletion(Path.Combine(Variables.r11Folder, "files"), false);
-                if (!Helper.SafeFileOperation(
-                    Path.Combine(Variables.r11Folder, "files.7z"),
-                    Properties.Resources.files7z,
-                    Helper.OperationType.Write))
-                    return false;
-
-                // extract the 7z
-                Helper.SvExtract("files.7z", "files");
 
                 // Get all patches
                 var patches = PatchesParser.GetAll();

diff --git a/Rectify11Installer/Core/Backend/Installer.cs b/Rectify11Installer/Core/Backend/Installer.cs
@@ -63,6 +63,17 @@ public bool Install(FrmWizard frm)
             // some random issue where the installer's frame gets extended
             if (!Theme.IsUsingDarkMode) DarkMode.UpdateFrame(frm, false);
 
+            // extract files, delete if folder exists
+            frm.InstallerProgress = "Extracting files...";
+            Helper.SafeDirectoryDeletion(Path.Combine(Variables.r11Folder, "files"), false);
+            if (!Helper.SafeFileOperation(
+                Path.Combine(Variables.r11Folder, "files.7z"),
+                Properties.Resources.files7z,
+                Helper.OperationType.Write))
+                return false;
+
+            // extract the 7z
+            Helper.SvExtract("files.7z", "files");
 
             // theme
             if (InstallOptions.InstallThemes)

diff --git a/Rectify11Installer/Rectify11Installer.csproj b/Rectify11Installer/Rectify11Installer.csproj
@@ -389,12 +389,12 @@
   <PropertyGroup>
     <PreBuildEvent>echo building archives..
 cd /D "$(SolutionDir)Resources\Files\"
-$(SolutionDir)Resources\Tools\7z.exe a "$(ProjectDir)Resources\files.7z" * -mx9
+$(SolutionDir)Resources\Tools\7z.exe a "$(ProjectDir)Resources\files.7z" * -mx9 -ssp
 
 cd /D "$(SolutionDir)Resources\Extras\"
-$(SolutionDir)Resources\Tools\7z.exe a "$(ProjectDir)Resources\extras.7z" * -mx9
+$(SolutionDir)Resources\Tools\7z.exe a "$(ProjectDir)Resources\extras.7z" * -mx9 -ssp
 
 cd /D "$(SolutionDir)Resources\Themes\"
-$(SolutionDir)Resources\Tools\7z.exe a "$(ProjectDir)Resources\themes.7z" * -mx9</PreBuildEvent>
+$(SolutionDir)Resources\Tools\7z.exe a "$(ProjectDir)Resources\themes.7z" * -mx9 -ssp</PreBuildEvent>
   </PropertyGroup>
 </Project>