diff options
| author | Daniel <supsuper@gmail.com> | 2020-08-25 05:03:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 21:03:24 -0700 |
| commit | 42a90d3c147e2fc8bd8c773bd99062374e0bb460 (patch) | |
| tree | 9b6699bcd95956649fcf1488f2af65eccb7a2d6c /scripts | |
| parent | 99b07566f4e86f70ac2112a097e913ff180c9f20 (diff) | |
| download | vcpkg-42a90d3c147e2fc8bd8c773bd99062374e0bb460.tar.gz vcpkg-42a90d3c147e2fc8bd8c773bd99062374e0bb460.zip | |
Fix MSYS2 keyring not verifying on path with spaces (#13104)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_acquire_msys.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 937f7daa6..d719774c1 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -107,7 +107,7 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) ) # install the new keyring _execute_process( - COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman-key --verify ${KEYRING_SIG_PATH}" + COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman-key --verify \"${KEYRING_SIG_PATH}\"" WORKING_DIRECTORY ${TOOLPATH} RESULT_VARIABLE _vam_error_code ) @@ -115,7 +115,7 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) message(FATAL_ERROR "Cannot verify MSYS2 keyring.") endif() _execute_process( - COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -U ${KEYRING_PATH} --noconfirm" + COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -U \"${KEYRING_PATH}\" --noconfirm" WORKING_DIRECTORY ${TOOLPATH} ) # we have to kill all GnuPG daemons otherwise bash would potentially not be |