lksz
/
PowerShell_Scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to packagesz class code and the win package

This commit is contained in:
lksz@work 2020-12-06 01:18:12 +02:00
parent 8b2a4ca0cb
commit 4cec655429
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base.win/_.package.json
View File

@ -5,7 +5,7 @@
{ {
"custom": null, "custom": null,
"System": [ "System": [
"Windows" "Desktop"
], ],
"Hostname": null, "Hostname": null,
"Username": null, "Username": null,

3
base/Edit-MyScript.ps1
View File

@ -44,7 +44,8 @@
$possibleValues $possibleValues
})] })]
[string[]]$ScriptName [string[]]$ScriptName,
[switch]$WaitNotRequired = $env:WAIT_NOT_REQUIRED
) )
$local:EditRootPath=$MyPSScriptRoot $local:EditRootPath=$MyPSScriptRoot

2
base/src/Packagesz.class.inc.ps1
View File

@ -23,7 +23,7 @@ class Packagesz { #: System.Management.Automation.IValidateSetValuesGenerator {
$local:valid = $Package.Condition[0].Logic -notin ([szLogic]::or, [szLogic]::ornot) $local:valid = $Package.Condition[0].Logic -notin ([szLogic]::or, [szLogic]::ornot)
$local:currentSys = [SystemName]::_GetValidValues('',$true,$true); $local:currentSys = [SystemName]::_GetValidValues('',$true,$true);
$local:hostname = $(hostname) $local:hostname = $(hostname)
$local:username = $env:USER ?? $env:USERNAME $local:username = $( if( $env:USER ) { $env:USER } else { $env:USERNAME })
foreach( $local:c in $Package.Condition ) { foreach( $local:c in $Package.Condition ) {
if( $valid -eq ($c.Logic -in ([szLogic]::or, [szLogic]::ornot )) ) { continue } if( $valid -eq ($c.Logic -in ([szLogic]::or, [szLogic]::ornot )) ) { continue }