update appx logic for new packages on github

ancientproject · May 9, 2020 · 9eb78c6 · 9eb78c6
1 parent 261dfb6
commit 9eb78c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Rune.csproj b/src/Rune.csproj
@@ -7,7 +7,7 @@
     <RootNamespace>Rune.CLI</RootNamespace>
     <ApplicationIcon>resource\icon.ico</ApplicationIcon>
     <StartupObject></StartupObject>
-    <Version>0.70.617-beta</Version>
+    <Version>0.70.618-beta</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>

diff --git a/src/etc/Appx.cs b/src/etc/Appx.cs
@@ -29,7 +29,7 @@ public async ValueTask<FileInfo> DownloadAsync()
                 .WithHeader("User-Agent", $"RuneCLI/{HelpCommand.GetVersion()}")
                 .GetJsonAsync<GithubRelease[]>();
             var release = releases.First();
-            var targetFile = Config.Get($"github_{_type}", "file", $"{_type}-{OS}.zip");
+            var targetFile = Config.Get($"github_{_type}", "file", $"{_type}-{OS}-{Arch}.zip");
 
             var asset = release.Assets.FirstOrDefault(x => x.Name == targetFile);
 
@@ -56,7 +56,8 @@ public async ValueTask<FileInfo> DownloadAsync()
             return new FileInfo(Path.Combine(Dirs.CacheFolder.FullName, targetFile));
         }
 
-
+        private string Arch 
+            => RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant();
         private string OS 
         {
             get
@@ -65,11 +66,11 @@ private string OS
                     throw new NotSupportedException($"{RuntimeInformation.ProcessArchitecture} is not support.");
 
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                    return "win64";
+                    return "win10";
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                    return "linux64";
+                    return "linux";
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                    return "osx64";
+                    return $"osx.10.14";
                 throw new NotSupportedException($"{RuntimeInformation.OSDescription} is not support.");
             }
         }