From fd9b8a968c18ac32adc1010718f1825ebeaf3c80 Mon Sep 17 00:00:00 2001
From: Gal Szkolnik <code@lksz.me>
Date: Fri, 16 Jul 2021 09:04:24 -0400
Subject: [PATCH] Fix dps and Get-HAPath

DPS -MatchAny should work better now
Get-HAPath refined
---
 HomeAssistant/Get-HAPath.ps1 | 11 +++++++----
 docker/Get-DockerProcess.ps1 |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/HomeAssistant/Get-HAPath.ps1 b/HomeAssistant/Get-HAPath.ps1
index a1f9c93..aa0b590 100644
--- a/HomeAssistant/Get-HAPath.ps1
+++ b/HomeAssistant/Get-HAPath.ps1
@@ -1,6 +1,9 @@
-if( $HAConfigPath ) { return $HAConfigPath }
 @(
     $(
-        @($HAConfigPath,'/srv/ha/current/homeassistant','/usr/share/hassio/homeassistant') | Where-Object { Test-Path -Type Container $_ } | Select-Object -First 1
-    ), '/srv/ha/current/homeassistant'
-) | Where-Object { $_ } | Select-Object -First 1 -OutVariable HAConfigPath
+        @($HAConfigPath,'/srv/ha/current/homeassistant','/usr/share/hassio/homeassistant') |
+            Where-Object { $_ } |
+            Where-Object { Test-Path -Type Container $_ } |
+            Select-Object -First 1
+    ), $HAConfigPath, '/srv/ha/current/homeassistant'
+) | Where-Object { $_ } |
+    Select-Object -First 1 -OutVariable HAConfigPath
diff --git a/docker/Get-DockerProcess.ps1 b/docker/Get-DockerProcess.ps1
index ff280cf..8653a47 100644
--- a/docker/Get-DockerProcess.ps1
+++ b/docker/Get-DockerProcess.ps1
@@ -32,7 +32,7 @@ if( $MatchName ) {
 }
 
 if( $MatchAny ) {
-    $result = $result | Where-Object { $_ | Out-String | Where-Object { $_ -match $($MatchAny -join '|') } }
+    $result = $result | Where-Object { $_ | Format-Table -Wrap -HideTableHeaders | Out-String | Where-Object { $_ -match $($MatchAny -join '|') } }
 }
 
 if( $OrderBy ) {