Change to updater

- No longer renames folder just to update it. Renaming is now done on build instead of on update - every time.
TCNOco · Jun 28, 2021 · b4146cc · b4146cc
1 parent 5d3cf2e
commit b4146cc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/TcNo-Acc-Switcher-Client/PostBuild.bat b/TcNo-Acc-Switcher-Client/PostBuild.bat
@@ -38,6 +38,7 @@ RMDIR /Q/S "runtimes\win-arm64"
 RMDIR /Q x64
 RMDIR /Q x86
 copy /B /Y "..\..\..\Installer\_First_Run_Installer.exe" "_First_Run_Installer.exe"
+REN "wwwroot" "originalwwwroot"
 cd %origDir%
 GOTO end
 
@@ -75,6 +76,7 @@ RMDIR /Q/S "runtimes\win-arm64"
 RMDIR /Q x64
 RMDIR /Q x86
 copy /B /Y "..\..\..\Installer\_First_Run_Installer.exe" "_First_Run_Installer.exe"
+REN "wwwroot" "originalwwwroot"
 cd %origDir%
 GOTO end
 
@@ -114,6 +116,7 @@ RMDIR /Q/S "bin\Debug\net5.0-windows\runtimes\win-arm64"
 RMDIR /Q "bin\Release\net5.0-windows\x64"
 RMDIR /Q "bin\Release\net5.0-windows\x86"
 copy /B /Y "..\..\Installer\_First_Run_Installer.exe" "_First_Run_Installer.exe"
+REN "wwwroot" "originalwwwroot"
 cd %origDir%
 GOTO end
 
@@ -151,6 +154,7 @@ RMDIR /Q/S "bin\Release\net5.0-windows\runtimes\win-arm64"
 RMDIR /Q "bin\Release\net5.0-windows\x64"
 RMDIR /Q "bin\Release\net5.0-windows\x86"
 copy /B /Y "..\..\Installer\_First_Run_Installer.exe" "_First_Run_Installer.exe"
+REN "wwwroot" "originalwwwroot"
 cd %origDir%
 GOTO end
 

diff --git a/TcNo-Acc-Switcher-Globals/Globals.cs b/TcNo-Acc-Switcher-Globals/Globals.cs
@@ -23,7 +23,7 @@ public class Globals
 #pragma warning disable CA2211 // Non-constant fields should not be visible - This is necessary due to it being a launch parameter.
 	    public static bool VerboseMode;
 #pragma warning restore CA2211 // Non-constant fields should not be visible
-	    public static readonly string Version = "2021-06-28_00";
+	    public static readonly string Version = "2021-06-28_01";
 	    public static readonly string[] PlatformList = {"Steam", "Origin", "Ubisoft", "BattleNet", "Epic", "Riot"};
 
 	    #region LOGGER

diff --git a/TcNo-Acc-Switcher-Updater/MainWindow.xaml.cs b/TcNo-Acc-Switcher-Updater/MainWindow.xaml.cs
@@ -435,10 +435,10 @@ private void DoUpdate()
             // Check if files are in use
             CloseIfRunning(_currentDir);
 
-            if (Directory.Exists("originalwwwroot"))
+            if (Directory.Exists("wwwroot"))
             {
-                if (Directory.Exists("wwwroot")) RecursiveDelete(new DirectoryInfo("wwwroot"), false);
-	            Directory.Move("originalwwwroot", "wwwroot");
+	            if (Directory.Exists("originalwwwroot")) RecursiveDelete(new DirectoryInfo("originalwwwroot"), false);
+	            Directory.Move("wwwroot", "originalwwwroot");
             }
 
             // APPLY UPDATE
@@ -509,11 +509,6 @@ private void DoUpdate()
             }
 
             SetStatusAndLog("Updating files in Documents!");
-            if (Directory.Exists("originalwwwroot"))
-            {
-	            RecursiveDelete(new DirectoryInfo("originalwwwroot"), false);
-	            Directory.Move("wwwroot", "originalwwwroot");
-            }
 			InitWwwroot(true);
             InitFolder("themes", true);
 
@@ -569,7 +564,6 @@ private void VerifyFiles()
                 {
 	                var key = oKey;
 	                if (key.StartsWith("updater")) continue; // Ignore own files >> Otherwise IOException
-	                if (key.StartsWith("wwwroot")) key = key.Replace("wwwroot", "originalwwwroot");
                     cur++;
                     UpdateProgress(cur * 100 / verifyDictTotal);
                     if (!File.Exists(key))