Merge branch 'master' of https://code.lksz.me/lksz/PowerShell_Scripts

base.linux/sz-df.ps1

@@ -24,8 +24,8 @@ $local:df = @()
         $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
+         $_.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 ) {

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 }