Skip to content

ProjFSFilter: Be more robust to missing PowerShell #1658

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
derrickstolee merged 2 commits into from
May 12, 2020
Merged

ProjFSFilter: Be more robust to missing PowerShell #1658

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b71015
ProjFSFilter: Be more robust to missing PowerShell
derrickstolee Apr 17, 2020
18a4853
ProjFSFilter: use 'where' to find powershell
derrickstolee Apr 20, 2020
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
30 changes: 26 additions & 4 deletions GVFS/GVFS.Platform.Windows/ProjFSFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,9 +679,16 @@ private static bool TryEnableProjFSOptionalFeature(ITracer tracer, PhysicalFileS

private static ProcessResult GetProjFSOptionalFeatureStatus()
{
return CallPowershellCommand(
"$var=(Get-WindowsOptionalFeature -Online -FeatureName " + OptionalFeatureName + "); if($var -eq $null){exit " +
(int)ProjFSInboxStatus.NotInbox + "}else{if($var.State -eq 'Enabled'){exit " + (int)ProjFSInboxStatus.Enabled + "}else{exit " + (int)ProjFSInboxStatus.Disabled + "}}");
try
{
return CallPowershellCommand(
"$var=(Get-WindowsOptionalFeature -Online -FeatureName " + OptionalFeatureName + "); if($var -eq $null){exit " +
(int)ProjFSInboxStatus.NotInbox + "}else{if($var.State -eq 'Enabled'){exit " + (int)ProjFSInboxStatus.Enabled + "}else{exit " + (int)ProjFSInboxStatus.Disabled + "}}");
}
catch (PowershellNotFoundException e)
{
return new ProcessResult(string.Empty, e.Message, (int)ProjFSInboxStatus.Invalid);
}
Comment thread
derrickstolee marked this conversation as resolved.
}

private static EventMetadata CreateEventMetadata(Exception e = null)
Expand All @@ -698,7 +705,14 @@ private static EventMetadata CreateEventMetadata(Exception e = null)

private static ProcessResult CallPowershellCommand(string command)
{
return ProcessHelper.Run("powershell.exe", "-NonInteractive -NoProfile -Command \"& { " + command + " }\"");
ProcessResult whereResult = ProcessHelper.Run("where.exe", "powershell.exe");

if (whereResult.ExitCode != 0)
{
throw new PowershellNotFoundException();
}

return ProcessHelper.Run(whereResult.Output.Trim(), "-NonInteractive -NoProfile -Command \"& { " + command + " }\"");
}

// Using an Impl method allows TryPrepareFolderForCallbacks to catch any ProjFS dependency related exceptions
Expand Down Expand Up @@ -734,5 +748,13 @@ public static extern bool GetVolumePathName(
StringBuilder volumePathName,
uint bufferLength);
}

private class PowershellNotFoundException : Exception
{
public PowershellNotFoundException()
: base("powershell.exe was not found")
{
}
}
}
}