Skip to content

Checking for 'func' command works on MacOS too #14

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

Merged
mark-abrams merged 2 commits into from
May 29, 2023
Merged

Checking for 'func' command works on MacOS too #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b20fb3
Check func command that works on MacOS too
eashi May 17, 2023
064f05f
Merge branch 'main' into main
mark-abrams May 29, 2023
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
12 changes: 6 additions & 6 deletions LogicAppUnit/Hosting/WorkflowTestHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,21 +215,21 @@ private static void KillFunctionHostProcesses()
private static string GetEnvPathForFunctionTools()
{
string exePath;
if(OperatingSystem.IsWindows())
if (OperatingSystem.IsWindows())
{
var enviromentPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine);
exePath = enviromentPath.Split(';').Select(x => Path.Combine(x, "func.exe")).Where(x => File.Exists(x)).FirstOrDefault();
exePath = enviromentPath.Split(Path.PathSeparator).Select(x => Path.Combine(x, "func.exe")).Where(x => File.Exists(x)).FirstOrDefault();
}
else
{
var enviromentPath = Environment.GetEnvironmentVariable("PATH");
exePath = enviromentPath.Split(':').Select(x => Path.Combine(x, "func")).Where(x => File.Exists(x)).FirstOrDefault();
exePath = enviromentPath.Split(Path.PathSeparator).Select(x => Path.Combine(x, "func")).Where(x => File.Exists(x)).FirstOrDefault();
}

if (!string.IsNullOrWhiteSpace(exePath))
if (!string.IsNullOrWhiteSpace(exePathWithExtension))
{
Console.WriteLine($"Path for Azure Function Core tools: {exePath}");
return exePath;
Console.WriteLine($"Path for Azure Function Core tools: {exePathWithExtension}");
return exePathWithExtension;
}
else
{
Expand Down