From 4cec655429be0586f4145746e933f15b77974d7f Mon Sep 17 00:00:00 2001
From: "lksz@work" <code@lksz.me>
Date: Sun, 6 Dec 2020 01:18:12 +0200
Subject: [PATCH] Fixes to packagesz class code and the win package

---
 base.win/_.package.json          | 2 +-
 base/Edit-MyScript.ps1           | 3 ++-
 base/src/Packagesz.class.inc.ps1 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/base.win/_.package.json b/base.win/_.package.json
index 3a5346f..b1f2cf8 100644
--- a/base.win/_.package.json
+++ b/base.win/_.package.json
@@ -5,7 +5,7 @@
       {
         "custom": null,
         "System": [
-          "Windows"
+          "Desktop"
         ],
         "Hostname": null,
         "Username": null,
diff --git a/base/Edit-MyScript.ps1 b/base/Edit-MyScript.ps1
index 8095b79..1cace96 100644
--- a/base/Edit-MyScript.ps1
+++ b/base/Edit-MyScript.ps1
@@ -44,7 +44,8 @@
 
     $possibleValues
   })]
-  [string[]]$ScriptName
+  [string[]]$ScriptName,
+  [switch]$WaitNotRequired = $env:WAIT_NOT_REQUIRED
 )
 
 $local:EditRootPath=$MyPSScriptRoot
diff --git a/base/src/Packagesz.class.inc.ps1 b/base/src/Packagesz.class.inc.ps1
index 1e25ccc..55bf7e2 100644
--- a/base/src/Packagesz.class.inc.ps1
+++ b/base/src/Packagesz.class.inc.ps1
@@ -23,7 +23,7 @@ class Packagesz { #: System.Management.Automation.IValidateSetValuesGenerator {
         $local:valid = $Package.Condition[0].Logic -notin ([szLogic]::or, [szLogic]::ornot)
         $local:currentSys = [SystemName]::_GetValidValues('',$true,$true);
         $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 ) {
             if( $valid -eq ($c.Logic -in ([szLogic]::or, [szLogic]::ornot )) ) { continue }