fix prereq bug for multi-line powershell (#815)

* move emond test into correct T# * only show cleanup with inputs if there are inputs * fix prereq bug for multi-line powershell Co-authored-by: Tony M Lambert <[email protected]> Co-authored-by: Michael Haag <[email protected]>
redcanaryco · Jan 29, 2020 · 196b2ae · 196b2ae
1 parent 373f1b6
commit 196b2ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Invoke-AtomicRedTeam/Private/Invoke-CheckPrereqs.ps1 b/Invoke-AtomicRedTeam/Private/Invoke-CheckPrereqs.ps1
@@ -6,7 +6,7 @@ function Invoke-CheckPrereqs ($test, $isElevated, $customInputArgs, $PathToAtomi
     foreach ($dep in $test.dependencies) {
         $executor = Get-PrereqExecutor $test
         $final_command = Merge-InputArgs $dep.prereq_command $test $customInputArgs $PathToAtomicsFolder
-        $final_command = ($final_Command.trim()).Replace("`n", " && ")
+        if($executor -ne "powershell") { $final_command = ($final_Command.trim()).Replace("`n", " && ") }
         $res = Invoke-ExecuteCommand $final_command $executor $TimeoutSeconds
         $description = Merge-InputArgs $dep.description $test $customInputArgs $PathToAtomicsFolder
         if ($res -ne 0) {

diff --git a/Invoke-AtomicRedTeam/Public/Invoke-AtomicTest.ps1 b/Invoke-AtomicRedTeam/Public/Invoke-AtomicTest.ps1
@@ -202,7 +202,7 @@ function Invoke-AtomicTest {
                             $description = (Merge-InputArgs $dep.description $test $InputArgs $PathToAtomicsFolder).trim()
                             Write-KeyValue  "Attempting to satisfy prereq: " $description
                             $final_command_prereq = Merge-InputArgs $dep.prereq_command $test $InputArgs $PathToAtomicsFolder
-                            $final_command_prereq = ($final_command_prereq.trim()).Replace("`n", " && ")
+                            if($executor -ne "powershell") { $final_command_prereq = ($final_command_prereq.trim()).Replace("`n", " && ") }
                             $final_command_get_prereq = Merge-InputArgs $dep.get_prereq_command $test $InputArgs $PathToAtomicsFolder
                             $res = Invoke-ExecuteCommand $final_command_prereq $executor $TimeoutSeconds