From a24aab78f081c9fc9a6977bc7b1658f8e4ae1708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kl=C3=B6tzke?= Date: Sun, 20 Aug 2023 22:29:27 +0200 Subject: [PATCH] input: fix PowerShell fingerprint scripts When the default language is set to PowerShell, any script without the language suffix should apply to PowerShell. Specifically, the "fingerprintScript" should be executed as PowerShell script if "fingerprintScriptPwsh" is not set. This was not working, though. --- pym/bob/input.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/bob/input.py b/pym/bob/input.py index b2c461311..fb7a3705d 100644 --- a/pym/bob/input.py +++ b/pym/bob/input.py @@ -3722,7 +3722,7 @@ def __createSchemas(self): schema.Optional('environment') : VarDefineValidator("provideTools::environment"), schema.Optional('fingerprintScript', default="") : str, schema.Optional('fingerprintScriptBash') : str, - schema.Optional('fingerprintScriptPwsh', default="") : str, + schema.Optional('fingerprintScriptPwsh') : str, schema.Optional('fingerprintIf') : schema.Or(None, str, bool, IfExpression), schema.Optional('fingerprintVars') : [ varNameUseSchema ], }) @@ -3742,7 +3742,7 @@ def __createSchemas(self): schema.Optional('packageNetAccess') : bool, schema.Optional('fingerprintScript', default="") : str, schema.Optional('fingerprintScriptBash') : str, - schema.Optional('fingerprintScriptPwsh', default="") : str, + schema.Optional('fingerprintScriptPwsh') : str, schema.Optional('fingerprintIf') : schema.Or(None, str, bool, IfExpression), schema.Optional('fingerprintVars') : [ varNameUseSchema ], schema.Optional('scriptLanguage') : schema.And(schema.Or("bash", "PowerShell"),