Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for the Squirrel.Utility.CreateZipFromDirectory on MacOS #1855

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+6 −5
Open

Fix for the Squirrel.Utility.CreateZipFromDirectory on MacOS #1855

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/Squirrel/Utility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,10 @@ public static string FindHelperExecutable(string toFind, IEnumerable<string> add
{
additionalDirs = additionalDirs ?? Enumerable.Empty<string>();
var dirs = (new[] { Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) })
.Concat(Environment.OSVersion.Platform != PlatformID.MacOSX ? Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? Enumerable.Empty<string>() : Enumerable.Empty<string>())
.Concat(additionalDirs ?? Enumerable.Empty<string>());

var exe = @".\" + toFind;
var exe = Path.Combine(@".", toFind);
return dirs
.Select(x => Path.Combine(x, toFind))
.FirstOrDefault(x => File.Exists(x)) ?? exe;
Expand All @@ -368,9 +369,9 @@ static string find7Zip()
"..", "..", "..", "..",
"vendor", "7zip"
);
return FindHelperExecutable("7z.exe", new[] { vendorDir });
return FindHelperExecutable(Environment.OSVersion.Platform != PlatformID.MacOSX ? "7z" : "7z.exe", new[] { vendorDir });
} else {
return FindHelperExecutable("7z.exe");
return FindHelperExecutable(Environment.OSVersion.Platform != PlatformID.MacOSX ? "7z" : "7z.exe");
}
}

Expand All @@ -382,7 +383,7 @@ public static async Task ExtractZipToDirectory(string zipFilePath, string outFol
try {
var cmd = sevenZip;
var args = String.Format("x \"{0}\" -tzip -mmt on -aoa -y -o\"{1}\" *", zipFilePath, outFolder);
if (Environment.OSVersion.Platform != PlatformID.Win32NT) {
if (Environment.OSVersion.Platform != PlatformID.MacOSX && Environment.OSVersion.Platform != PlatformID.Win32NT) {
cmd = "wine";
args = sevenZip + " " + args;
}
Expand All @@ -403,7 +404,7 @@ public static async Task CreateZipFromDirectory(string zipFilePath, string inFol
try {
var cmd = sevenZip;
var args = String.Format("a \"{0}\" -tzip -aoa -y -mmt on *", zipFilePath);
if (Environment.OSVersion.Platform != PlatformID.Win32NT) {
if (Environment.OSVersion.Platform != PlatformID.MacOSX && Environment.OSVersion.Platform != PlatformID.Win32NT) {
cmd = "wine";
args = sevenZip + " " + args;
}
Expand Down