1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-29 19:38:18 +00:00

Merge pull request #1521 from philsmd/patch-2

appveyor: remove conflicting package "catgets"
This commit is contained in:
Jens Steube 2018-02-13 19:34:32 +01:00 committed by GitHub
commit 68ab3277d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,6 +32,8 @@ init:
install: install:
- ps: if (Test-Path Env:\CYG_ROOT) { Start-FileDownload "http://cygwin.com/$env:CYG_SETUP" -FileName "$env:CYG_SETUP" } - ps: if (Test-Path Env:\CYG_ROOT) { Start-FileDownload "http://cygwin.com/$env:CYG_SETUP" -FileName "$env:CYG_SETUP" }
- if defined CYG_ROOT (%CYG_SETUP% --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages "%CYG_PACKAGES%" --upgrade-also) - if defined CYG_ROOT (%CYG_SETUP% --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages "%CYG_PACKAGES%" --upgrade-also)
# remove the conflicting package "catgets" (it conflicts with msys2-runtime)
- if defined MSYSTEM (%BASH% -lc "pacman -Rns catgets --noconfirm")
- if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm") - if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm")
# the following line is not a duplicate line: # the following line is not a duplicate line:
# it is necessary to upgrade the MSYS base files and after that all the packages # it is necessary to upgrade the MSYS base files and after that all the packages