[Packager] Use macOS instead of OSX
MODIFY
WalletWasabi.Packager/MacSignTools.cs
WalletWasabi.Packager/MacSignTools.cs
@@ -22,8 +22,8 @@ public static class MacSignTools
string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
- var srcZipFileNamePattern = "Wasabi-osx-*.zip";
- var files = Directory.GetFiles(desktopPath, srcZipFileNamePattern); // Example: Wasabi-osx-1.1.10.2.zip
+ var srcZipFileNamePattern = "Wasabi-macOS-*.zip";
+ var files = Directory.GetFiles(desktopPath, srcZipFileNamePattern); // Example: Wasabi-macOS-1.1.10.2.zip
if (files.Length != 1)
{
throw new InvalidDataException($"{srcZipFileNamePattern} file missing or there are more on Desktop! There must be exactly one!");

MODIFY
WalletWasabi.Packager/Program.cs
WalletWasabi.Packager/Program.cs
@@ -160,7 +160,7 @@ public static class Program
{
throw new Exception(".dmg does not exist.");
}
- string zipFilePath = Path.Combine(BinDistDirectory, $"Wasabi-osx-{VersionPrefix}.zip");
+ string zipFilePath = Path.Combine(BinDistDirectory, $"Wasabi-macOS-{VersionPrefix}.zip");
if (File.Exists(zipFilePath))
{
File.Delete(zipFilePath);
@@ -319,7 +319,7 @@ public static class Program
continue; // In Windows build at this moment it does not matter though.
}
- ZipFile.CreateFromDirectory(currentBinDistDirectory, Path.Combine(deliveryPath, $"Wasabi-{deterministicFileNameTag}-{target}.zip"));
+ ZipFile.CreateFromDirectory(currentBinDistDirectory, Path.Combine(deliveryPath, $"Wasabi-{deterministicFileNameTag}-{GetPackageTargetPostfix(target)}.zip"));
if (IsContinuousDelivery)
{
@@ -334,14 +334,14 @@ public static class Program
continue;
}
- ZipFile.CreateFromDirectory(currentBinDistDirectory, Path.Combine(deliveryPath, $"Wasabi-{deterministicFileNameTag}-{target}.zip"));
+ ZipFile.CreateFromDirectory(currentBinDistDirectory, Path.Combine(deliveryPath, $"Wasabi-{deterministicFileNameTag}-{GetPackageTargetPostfix(target)}.zip"));
if (IsContinuousDelivery)
{
continue;
}
- ZipFile.CreateFromDirectory(currentBinDistDirectory, Path.Combine(BinDistDirectory, $"Wasabi-osx-{VersionPrefix}.zip"));
+ ZipFile.CreateFromDirectory(currentBinDistDirectory, Path.Combine(BinDistDirectory, $"Wasabi-macOS-{VersionPrefix}.zip"));
await IoHelpers.TryDeleteDirectoryAsync(currentBinDistDirectory).ConfigureAwait(false);
Console.WriteLine($"Deleted {currentBinDistDirectory}");
@@ -354,7 +354,7 @@ public static class Program
continue;
}
- ZipFile.CreateFromDirectory(currentBinDistDirectory, Path.Combine(deliveryPath, $"Wasabi-{deterministicFileNameTag}-{target}.zip"));
+ ZipFile.CreateFromDirectory(currentBinDistDirectory, Path.Combine(deliveryPath, $"Wasabi-{deterministicFileNameTag}-{GetPackageTargetPostfix(target)}.zip"));
if (IsContinuousDelivery)
{
@@ -610,4 +610,14 @@ public static class Program
return false;
}
+
+ private static string GetPackageTargetPostfix(string target)
+ {
+ if (target.StartsWith("osx"))
+ {
+ return target.Replace("osx", "macOS");
+ }
+
+ return target;
+ }
}

[Packager] Use macOS instead of OSX