From 7adfdf1cdde5bba9e915aabf0272424dd307a211 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Wed, 11 Jul 2018 09:08:18 -0700 Subject: [PATCH 1/2] Fix issue with stat format on Linux --- module/PowerShellEditorServices/Start-EditorServices.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/PowerShellEditorServices/Start-EditorServices.ps1 b/module/PowerShellEditorServices/Start-EditorServices.ps1 index 355e7f656..dc36dac1f 100644 --- a/module/PowerShellEditorServices/Start-EditorServices.ps1 +++ b/module/PowerShellEditorServices/Start-EditorServices.ps1 @@ -224,7 +224,7 @@ function Set-NamedPipeMode { ) chmod $DEFAULT_USER_MODE $PipeFile if ($IsLinux) { - $mode = stat -c "%A" $PipeFile + $mode = stat -c "%a" $PipeFile } else { $mode = stat -f "%A" $PipeFile From 23484be47446a59471e31ec3d91e2029200f3c95 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Wed, 11 Jul 2018 09:35:49 -0700 Subject: [PATCH 2/2] Improve macOS differentiation --- module/PowerShellEditorServices/Start-EditorServices.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/module/PowerShellEditorServices/Start-EditorServices.ps1 b/module/PowerShellEditorServices/Start-EditorServices.ps1 index dc36dac1f..34d400ef1 100644 --- a/module/PowerShellEditorServices/Start-EditorServices.ps1 +++ b/module/PowerShellEditorServices/Start-EditorServices.ps1 @@ -222,13 +222,20 @@ function Set-NamedPipeMode { [string] $PipeFile ) + + if ($IsWindows) { + return + } + chmod $DEFAULT_USER_MODE $PipeFile + if ($IsLinux) { $mode = stat -c "%a" $PipeFile } - else { + elseif ($IsMacOS) { $mode = stat -f "%A" $PipeFile } + if ($mode -ne $DEFAULT_USER_MODE) { ExitWithError "Permissions to the pipe file were not set properly. Expected: $DEFAULT_USER_MODE Actual: $mode for file: $PipeFile" }