Fix issue with stat format on Linux (#698)

rjmholt · web-flow · commit eecfe026d9bb · 2018-07-11T10:13:47.000-07:00
* Fix issue with stat format on Linux

* Improve macOS differentiation
diff --git 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
+        $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"
     }

Original file line number	Diff line number	Diff line change
`@@ -222,13 +222,20 @@ function Set-NamedPipeMode {`
`222`	`222`	`[string]`
`223`	`223`	`$PipeFile`
`224`	`224`	`)`
	`225`	`+`
	`226`	`+ if ($IsWindows) {`
	`227`	`+ return`
	`228`	`+ }`
	`229`	`+`
`225`	`230`	`chmod $DEFAULT_USER_MODE $PipeFile`
	`231`	`+`
`226`	`232`	`if ($IsLinux) {`
`227`		`- $mode = stat -c "%A" $PipeFile`
	`233`	`+ $mode = stat -c "%a" $PipeFile`
`228`	`234`	`}`
`229`		`- else {`
	`235`	`+ elseif ($IsMacOS) {`
`230`	`236`	`$mode = stat -f "%A" $PipeFile`
`231`	`237`	`}`
	`238`	`+`
`232`	`239`	`if ($mode -ne $DEFAULT_USER_MODE) {`
`233`	`240`	`ExitWithError "Permissions to the pipe file were not set properly. Expected: $DEFAULT_USER_MODE Actual: $mode for file: $PipeFile"`
`234`	`241`	`}`