mirror of
https://github.com/ShareX/ShareX.git
synced 2024-07-01 04:30:49 +12:00
Fix ExecutablePath, remove UploadOutputFile
This commit is contained in:
parent
a82330b835
commit
5c4409ffd3
|
@ -27,7 +27,6 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
|
||||||
|
|
||||||
namespace ShareX.Setup
|
namespace ShareX.Setup
|
||||||
{
|
{
|
||||||
|
@ -41,20 +40,19 @@ private enum SetupJobs
|
||||||
CreatePortable = 1 << 1,
|
CreatePortable = 1 << 1,
|
||||||
CreateSteamFolder = 1 << 2,
|
CreateSteamFolder = 1 << 2,
|
||||||
OpenOutputDirectory = 1 << 3,
|
OpenOutputDirectory = 1 << 3,
|
||||||
UploadOutputFile = 1 << 4,
|
CreateMicrosoftStoreFolder = 1 << 4,
|
||||||
CreateMicrosoftStoreFolder = 1 << 5,
|
CreateMicrosoftStoreDebugFolder = 1 << 5,
|
||||||
CreateMicrosoftStoreDebugFolder = 1 << 6,
|
CompileAppx = 1 << 6,
|
||||||
CompileAppx = 1 << 7,
|
DownloadFFmpeg = 1 << 7,
|
||||||
DownloadFFmpeg = 1 << 8,
|
CreateChecksumFile = 1 << 8,
|
||||||
CreateChecksumFile = 1 << 9,
|
|
||||||
|
|
||||||
Stable = CreateSetup | CreatePortable | CreateChecksumFile | OpenOutputDirectory,
|
Stable = CreateSetup | CreatePortable | CreateChecksumFile | OpenOutputDirectory,
|
||||||
Setup = CreateSetup | OpenOutputDirectory,
|
Setup = CreateSetup | OpenOutputDirectory,
|
||||||
Portable = CreatePortable | OpenOutputDirectory,
|
Portable = CreatePortable | OpenOutputDirectory,
|
||||||
Steam = CreateSteamFolder | OpenOutputDirectory,
|
Steam = CreateSteamFolder | OpenOutputDirectory,
|
||||||
MicrosoftStore = CreateMicrosoftStoreFolder,
|
MicrosoftStore = CreateMicrosoftStoreFolder | CompileAppx | OpenOutputDirectory,
|
||||||
MicrosoftStoreDebug = CreateMicrosoftStoreDebugFolder,
|
MicrosoftStoreDebug = CreateMicrosoftStoreDebugFolder,
|
||||||
Beta = CreateSetup | UploadOutputFile,
|
|
||||||
AppVeyorRelease = CreateSetup | CreatePortable | CreateChecksumFile | DownloadFFmpeg,
|
AppVeyorRelease = CreateSetup | CreatePortable | CreateChecksumFile | DownloadFFmpeg,
|
||||||
AppVeyorSteam = CreateSteamFolder | DownloadFFmpeg,
|
AppVeyorSteam = CreateSteamFolder | DownloadFFmpeg,
|
||||||
AppVeyorMicrosoftStore = CreateMicrosoftStoreFolder | CompileAppx | DownloadFFmpeg
|
AppVeyorMicrosoftStore = CreateMicrosoftStoreFolder | CompileAppx | DownloadFFmpeg
|
||||||
|
@ -66,13 +64,39 @@ private enum SetupJobs
|
||||||
private static string ParentDir => AppVeyor ? "." : @"..\..\..\";
|
private static string ParentDir => AppVeyor ? "." : @"..\..\..\";
|
||||||
private static string BinDir => Path.Combine(ParentDir, "ShareX", "bin");
|
private static string BinDir => Path.Combine(ParentDir, "ShareX", "bin");
|
||||||
private static string ReleaseDir => Path.Combine(BinDir, "Release");
|
private static string ReleaseDir => Path.Combine(BinDir, "Release");
|
||||||
private static string ReleaseExecutablePath => Path.Combine(ReleaseDir, "ShareX.exe");
|
|
||||||
private static string DebugDir => Path.Combine(BinDir, "Debug");
|
private static string DebugDir => Path.Combine(BinDir, "Debug");
|
||||||
private static string DebugExecutablePath => Path.Combine(DebugDir, "ShareX.exe");
|
|
||||||
private static string SteamDir => Path.Combine(BinDir, "Steam");
|
private static string SteamDir => Path.Combine(BinDir, "Steam");
|
||||||
private static string MicrosoftStoreDir => Path.Combine(BinDir, "MicrosoftStore");
|
private static string MicrosoftStoreDir => Path.Combine(BinDir, "MicrosoftStore");
|
||||||
private static string MicrosoftStoreDebugDir => Path.Combine(BinDir, "MicrosoftStoreDebug");
|
private static string MicrosoftStoreDebugDir => Path.Combine(BinDir, "MicrosoftStoreDebug");
|
||||||
|
|
||||||
|
private static string ExecutablePath
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
string dir;
|
||||||
|
|
||||||
|
switch (Job)
|
||||||
|
{
|
||||||
|
default:
|
||||||
|
case SetupJobs.CreateSetup:
|
||||||
|
case SetupJobs.CreatePortable:
|
||||||
|
dir = ReleaseDir;
|
||||||
|
break;
|
||||||
|
case SetupJobs.CreateSteamFolder:
|
||||||
|
dir = SteamDir;
|
||||||
|
break;
|
||||||
|
case SetupJobs.CreateMicrosoftStoreFolder:
|
||||||
|
dir = MicrosoftStoreDir;
|
||||||
|
break;
|
||||||
|
case SetupJobs.CreateMicrosoftStoreDebugFolder:
|
||||||
|
dir = MicrosoftStoreDebugDir;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Path.Combine(dir, "ShareX.exe");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static string OutputDir => Path.Combine(ParentDir, "Output");
|
private static string OutputDir => Path.Combine(ParentDir, "Output");
|
||||||
private static string PortableOutputDir => Path.Combine(OutputDir, "ShareX-portable");
|
private static string PortableOutputDir => Path.Combine(OutputDir, "ShareX-portable");
|
||||||
private static string SteamOutputDir => Path.Combine(OutputDir, "ShareX-Steam");
|
private static string SteamOutputDir => Path.Combine(OutputDir, "ShareX-Steam");
|
||||||
|
@ -159,8 +183,6 @@ private static void Main(string[] args)
|
||||||
process.BeginOutputReadLine();
|
process.BeginOutputReadLine();
|
||||||
process.WaitForExit();
|
process.WaitForExit();
|
||||||
}
|
}
|
||||||
|
|
||||||
Directory.Delete(MicrosoftStoreOutputDir, true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Job.HasFlag(SetupJobs.CreateChecksumFile))
|
if (Job.HasFlag(SetupJobs.CreateChecksumFile))
|
||||||
|
@ -183,11 +205,6 @@ private static void Main(string[] args)
|
||||||
OpenOutputDirectory();
|
OpenOutputDirectory();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Job.HasFlag(SetupJobs.UploadOutputFile))
|
|
||||||
{
|
|
||||||
UploadLatestFile();
|
|
||||||
}
|
|
||||||
|
|
||||||
Console.WriteLine("ShareX setup successfully completed.");
|
Console.WriteLine("ShareX setup successfully completed.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -344,20 +361,9 @@ private static void OpenOutputDirectory()
|
||||||
Process.Start(OutputDir);
|
Process.Start(OutputDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void UploadLatestFile()
|
|
||||||
{
|
|
||||||
FileInfo fileInfo = new DirectoryInfo(OutputDir).GetFiles("*.exe").OrderByDescending(f => f.LastWriteTime).FirstOrDefault();
|
|
||||||
|
|
||||||
if (fileInfo != null)
|
|
||||||
{
|
|
||||||
Console.WriteLine("Uploading setup file.");
|
|
||||||
Process.Start(DebugExecutablePath, fileInfo.FullName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string GetAppVersion()
|
private static string GetAppVersion()
|
||||||
{
|
{
|
||||||
FileVersionInfo versionInfo = FileVersionInfo.GetVersionInfo(ReleaseExecutablePath);
|
FileVersionInfo versionInfo = FileVersionInfo.GetVersionInfo(ExecutablePath);
|
||||||
return $"{versionInfo.ProductMajorPart}.{versionInfo.ProductMinorPart}.{versionInfo.ProductBuildPart}";
|
return $"{versionInfo.ProductMajorPart}.{versionInfo.ProductMinorPart}.{versionInfo.ProductBuildPart}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue