Tools: Do deb/rpm packages before flatpak

cyanfish · Dec 13, 2023 · 3a47c7d · 3a47c7d
1 parent 06e81c8
commit 3a47c7d
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/NAPS2.Tools/Project/Targets/TargetsHelper.cs b/NAPS2.Tools/Project/Targets/TargetsHelper.cs
@@ -101,37 +101,37 @@ private static IEnumerable<PackageTarget> DoEnumeratePackageTargets(string? pack
                         yield return new PackageTarget(PackageType.Zip, Platform.Win64);
                     }
                 }
-                if ((allPkg || packageType == "flatpak") && (!requireCompatiblePlatform || OperatingSystem.IsLinux()))
+                if ((allPkg || packageType == "deb") && (!requireCompatiblePlatform || OperatingSystem.IsLinux()))
                 {
                     if (allPlat || platform == "linux")
                     {
-                        yield return new PackageTarget(PackageType.Flatpak, Platform.Linux);
+                        yield return new PackageTarget(PackageType.Deb, Platform.Linux);
                     }
                     if (allPlat || platform == "linuxarm")
                     {
-                        yield return new PackageTarget(PackageType.Flatpak, Platform.LinuxArm);
+                        yield return new PackageTarget(PackageType.Deb, Platform.LinuxArm);
                     }
                 }
-                if ((allPkg || packageType == "deb") && (!requireCompatiblePlatform || OperatingSystem.IsLinux()))
+                if ((allPkg || packageType == "rpm") && (!requireCompatiblePlatform || OperatingSystem.IsLinux()))
                 {
                     if (allPlat || platform == "linux")
                     {
-                        yield return new PackageTarget(PackageType.Deb, Platform.Linux);
+                        yield return new PackageTarget(PackageType.Rpm, Platform.Linux);
                     }
                     if (allPlat || platform == "linuxarm")
                     {
-                        yield return new PackageTarget(PackageType.Deb, Platform.LinuxArm);
+                        yield return new PackageTarget(PackageType.Rpm, Platform.LinuxArm);
                     }
                 }
-                if ((allPkg || packageType == "rpm") && (!requireCompatiblePlatform || OperatingSystem.IsLinux()))
+                if ((allPkg || packageType == "flatpak") && (!requireCompatiblePlatform || OperatingSystem.IsLinux()))
                 {
                     if (allPlat || platform == "linux")
                     {
-                        yield return new PackageTarget(PackageType.Rpm, Platform.Linux);
+                        yield return new PackageTarget(PackageType.Flatpak, Platform.Linux);
                     }
                     if (allPlat || platform == "linuxarm")
                     {
-                        yield return new PackageTarget(PackageType.Rpm, Platform.LinuxArm);
+                        yield return new PackageTarget(PackageType.Flatpak, Platform.LinuxArm);
                     }
                 }
                 if ((allPkg || packageType == "pkg") && (!requireCompatiblePlatform || OperatingSystem.IsMacOS()))