trinitor/DetectionLab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolving merge conflicts

Browse Source
This commit is contained in:
Chris Long
2020-03-27 14:58:18 -07:00
parent 34d8a39c43 0f5faccf46
commit c7e013558a
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vagrant/scripts/install-choco-extras.ps1
+1 -2
View File
@@ -10,7 +10,6 @@ If (-not (Test-Path "C:\ProgramData\chocolatey")) {
}
Write-Host "Installing Chocolatey extras..."
choco install -y --limit-output --no-progress wireshark
choco install -y --limit-output --no-progress winpcap
choco install -y --limit-output --no-progress wireshark winpcap
Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Choco addons complete!"
Vagrant/scripts/install-utilities.ps1
+1 -3
View File
@@ -14,8 +14,6 @@ If ($(hostname) -eq "win10") {
choco install -y --limit-output --no-progress classic-shell -installArgs ADDLOCAL=ClassicStartMenu
& "C:\Program Files\Classic Shell\ClassicStartMenu.exe" "-xml" "c:\vagrant\resources\windows\MenuSettings.xml"
}
choco install -y --limit-output --no-progress NotepadPlusPlus
choco install -y --limit-output --no-progress GoogleChrome
choco install -y --limit-output --no-progress WinRar
choco install -y --limit-output --no-progress NotepadPlusPlus GoogleChrome WinRar
Write-Host "Utilties installation complete!"