diff --git a/base.linux/sz-df.ps1 b/base.linux/sz-df.ps1 index c1adf10..3c913bb 100644 --- a/base.linux/sz-df.ps1 +++ b/base.linux/sz-df.ps1 @@ -23,9 +23,9 @@ $local:df = @() Select-Object -Skip 1 | ForEach-Object { $local:df = $_.Split(' ', [StringSplitOptions]::RemoveEmptyEntries) NewDataRow $df[0] $df[1] $df[2] $df[3] $df[4] $df[5] $df[6] - } | Where-Object { - -not ($_.FSType -eq 'zfs' -and $_.Source -match '/') - } | Sort-Object -Property Target + } | Where-Object { + $_.FSType -notin 'squashfs' -and $_.Target -notin 'zfs' -and ($_.FSType -ne 'zfs' -xor ($_.Source -match '^[^/]+(?:/[^/]+)$' -or $_.Target -match '^(?:/[^/]+)$')) + } | Sort-Object -Property FSType,Target #$zpool_cmd = get-command zpool | Where-Object CommandType -eq 'Application' | Select-Object -ExpandProperty Source #if( $zpool_cmd ) { diff --git a/base/src/Packagesz.class.inc.ps1 b/base/src/Packagesz.class.inc.ps1 index 047d498..1e25ccc 100644 --- a/base/src/Packagesz.class.inc.ps1 +++ b/base/src/Packagesz.class.inc.ps1 @@ -38,7 +38,7 @@ class Packagesz { #: System.Management.Automation.IValidateSetValuesGenerator { $v = $v -and $($c.Username | Where-Object { $username -match $_ }) } if( $v -and $c.custom ) { - $v = $v -and ([bool]$(Invoke-ScriptBlock ([ScriptBlock]::Create($c.custom)))) + $v = $v -and ([bool]$(& ([ScriptBlock]::Create($c.custom)))) } switch( $c.Logic ) { [szLogic]::not { $valid = $valid -and -not $v }