From b178657d3f93503cca61dcaba4ab78b28f0fcd5f Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 24 Oct 2022 06:56:59 +0300 Subject: [PATCH] Code refactoring --- ShareX.Setup/Program.cs | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/ShareX.Setup/Program.cs b/ShareX.Setup/Program.cs index 5805a9978..3faa797f8 100644 --- a/ShareX.Setup/Program.cs +++ b/ShareX.Setup/Program.cs @@ -47,16 +47,14 @@ private enum SetupJobs CreateChecksumFile = 1 << 8, OpenOutputDirectory = 1 << 9, - Stable = CreateSetup | CreatePortable | CreateChecksumFile | OpenOutputDirectory, - Setup = CreateSetup | OpenOutputDirectory, - Portable = CreatePortable | OpenOutputDirectory, - Debug = CreateDebug | OpenOutputDirectory, - Steam = CreateSteamFolder | OpenOutputDirectory, - MicrosoftStore = CreateMicrosoftStoreFolder | CompileAppx | OpenOutputDirectory, - MicrosoftStoreDebug = CreateMicrosoftStoreDebugFolder + Release = CreateSetup | CreatePortable | DownloadFFmpeg | CreateChecksumFile | OpenOutputDirectory, + Debug = CreateDebug | DownloadFFmpeg | CreateChecksumFile | OpenOutputDirectory, + Steam = CreateSteamFolder | DownloadFFmpeg | CreateChecksumFile | OpenOutputDirectory, + MicrosoftStore = CreateMicrosoftStoreFolder | CompileAppx | DownloadFFmpeg | CreateChecksumFile | OpenOutputDirectory, + MicrosoftStoreDebug = CreateMicrosoftStoreDebugFolder | CompileAppx | DownloadFFmpeg | CreateChecksumFile | OpenOutputDirectory } - private static SetupJobs Job = SetupJobs.Debug; + private static SetupJobs Job = SetupJobs.Release; private static bool AppVeyor = false; private static string Configuration @@ -199,7 +197,7 @@ private static void Main(string[] args) FileHelpers.CopyAll(OutputDir, ParentDir); } - if (Job.HasFlag(SetupJobs.OpenOutputDirectory)) + if (Job.HasFlag(SetupJobs.OpenOutputDirectory) && !AppVeyor) { FileHelpers.OpenFolder(OutputDir, false); } @@ -224,19 +222,19 @@ private static void CheckArgs(string[] args) if (configuration.Equals("Release", StringComparison.OrdinalIgnoreCase)) { - Job = SetupJobs.CreateSetup | SetupJobs.CreatePortable | SetupJobs.CreateChecksumFile | SetupJobs.DownloadFFmpeg; + Job = SetupJobs.Release; } else if (configuration.Equals("Debug", StringComparison.OrdinalIgnoreCase)) { - Job = SetupJobs.CreateDebug | SetupJobs.CreateChecksumFile | SetupJobs.DownloadFFmpeg; + Job = SetupJobs.Debug; } else if (configuration.Equals("Steam", StringComparison.OrdinalIgnoreCase)) { - Job = SetupJobs.CreateSteamFolder | SetupJobs.CreateChecksumFile | SetupJobs.DownloadFFmpeg; + Job = SetupJobs.Steam; } else if (configuration.Equals("MicrosoftStore", StringComparison.OrdinalIgnoreCase)) { - Job = SetupJobs.CreateMicrosoftStoreFolder | SetupJobs.CompileAppx | SetupJobs.CreateChecksumFile | SetupJobs.DownloadFFmpeg; + Job = SetupJobs.MicrosoftStore; } else {