updateスクリプト起動場所を変更した

anoyetta · Sep 25, 2021 · 8801de5 · 8801de5
1 parent 7b872fc
commit 8801de5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt
@@ -1 +1 @@
-v9.4.2
+v9.4.3
diff --git a/source/ACT.Hojoring.Common/Version.cs b/source/ACT.Hojoring.Common/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("9.4.0.2")]
-[assembly: AssemblyFileVersion("9.4.0.2")]
+[assembly: AssemblyVersion("9.4.0.3")]
+[assembly: AssemblyFileVersion("9.4.0.3")]
diff --git a/source/FFXIV.Framework/FFXIV.Framework/Common/UpdateChecker.cs b/source/FFXIV.Framework/FFXIV.Framework/Common/UpdateChecker.cs
@@ -313,7 +313,16 @@ public static string Update(
         public static async void StartUpdateScript(
             bool usePreRelease = false)
         {
-            var cd = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            var cd = DirectoryHelper.GetPluginRootDirectoryDelegate?.Invoke();
+            if (string.IsNullOrEmpty(cd))
+            {
+                cd = Path.Combine(
+                    Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
+                    "..");
+
+                cd = Path.GetFullPath(cd);
+            }
+
             var script = Path.Combine(cd, "update_hojoring.ps1");
 
             using (var web = new WebClient())
@@ -331,9 +340,9 @@ await web.DownloadFileTaskAsync(
 
             if (File.Exists(script))
             {
-                var args = $"-NoLog  -NoProfile -ExecutionPolicy Unrestricted -File \"{script}\" {usePreRelease}";
+                var args = $"-NoLogo -NoProfile -ExecutionPolicy Unrestricted -File \"{script}\" {usePreRelease}";
 
-                Process.Start("powershell.exe", args);
+                Process.Start(EnvironmentHelper.Pwsh, args);
             }
         }
 

diff --git a/source/FFXIV.Framework/FFXIV.Framework/resources/ResourcesDownloader.cs b/source/FFXIV.Framework/FFXIV.Framework/resources/ResourcesDownloader.cs
@@ -192,7 +192,7 @@ public Task WaitDownloadingAsync()
                 {
                     while (true)
                     {
-                        lock (Random)
+                        lock (Locker)
                         {
                             if (!this.isDownloading)
                             {