From b43af855ba0f0a222e48060335d66e2682feabcf Mon Sep 17 00:00:00 2001 From: Carrie Roberts Date: Fri, 24 Jan 2020 09:19:10 -0700 Subject: [PATCH] Only show cleanup (with inputs) if there are inputs (#792) * move emond test into correct T# * only show cleanup with inputs if there are inputs Co-authored-by: Tony M Lambert Co-authored-by: Michael Haag --- .../Invoke-AtomicRedTeam/Private/Show-Details.ps1 | 2 +- .../Invoke-AtomicRedTeam/Public/Invoke-AtomicTest.ps1 | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/execution-frameworks/Invoke-AtomicRedTeam/Invoke-AtomicRedTeam/Private/Show-Details.ps1 b/execution-frameworks/Invoke-AtomicRedTeam/Invoke-AtomicRedTeam/Private/Show-Details.ps1 index 315e70f8..de61760a 100644 --- a/execution-frameworks/Invoke-AtomicRedTeam/Invoke-AtomicRedTeam/Private/Show-Details.ps1 +++ b/execution-frameworks/Invoke-AtomicRedTeam/Invoke-AtomicRedTeam/Private/Show-Details.ps1 @@ -22,7 +22,7 @@ function Show-Details ($test, $testCount, $technique, $customInputArgs, $PathToA Write-Host -ForegroundColor Yellow "Cleanup Commands:" $final_command = Merge-InputArgs $test.executor.cleanup_command $test $customInputArgs $PathToAtomicsFolder Write-KeyValue "Command:`n" $test.executor.cleanup_command.trim() - if ($test.executor.command -ne $final_command) { Write-KeyValue "Command (with inputs):`n" $final_command.trim() } + if ($test.executor.cleanup_command -ne $final_command) { Write-KeyValue "Command (with inputs):`n" $final_command.trim() } } # Dependencies diff --git a/execution-frameworks/Invoke-AtomicRedTeam/Invoke-AtomicRedTeam/Public/Invoke-AtomicTest.ps1 b/execution-frameworks/Invoke-AtomicRedTeam/Invoke-AtomicRedTeam/Public/Invoke-AtomicTest.ps1 index 8e17c690..772e9226 100644 --- a/execution-frameworks/Invoke-AtomicRedTeam/Invoke-AtomicRedTeam/Public/Invoke-AtomicTest.ps1 +++ b/execution-frameworks/Invoke-AtomicRedTeam/Invoke-AtomicRedTeam/Public/Invoke-AtomicTest.ps1 @@ -264,5 +264,4 @@ function Invoke-AtomicTest { } # End of PROCESS block END { } # Intentionally left blank and can be removed -} -# Invoke-AtomicTest t1003 -TestNumbers 13 -GetPrereqs \ No newline at end of file +} \ No newline at end of file