Skip to content

Commit e071e67

Browse files
committed
sdk-installer: initialize pacman's keyring before calling pacman
A recent change in pacman invalidated the approach taken by Git for Windows' SDK where we simply bundle the keyring as per Git for Windows' maintainer's SDK. Instead, we now have to initialize the keyring explicitly. Reported by Lars Schneider. This fixes git-for-windows/git#670 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 79fc676 commit e071e67

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

sdk-installer/release.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ dlls_for_exes () {
7373
fileList="etc/nsswitch.conf \
7474
etc/pacman.conf \
7575
etc/pacman.d \
76+
usr/bin/pacman-key \
77+
usr/bin/tput.exe \
7678
usr/bin/pacman.exe \
7779
usr/bin/curl.exe \
7880
usr/bin/gpg.exe \

sdk-installer/setup-git-sdk.bat

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,13 @@
9292
@EXIT 1
9393
)
9494

95+
@REM we need a /tmp directory, just for the time being
96+
@MKDIR "%cwd%"\tmp
97+
98+
@REM next, initialize pacman's keyring
99+
@"%cwd%"\usr\bin\bash.exe -l -c '/usr/bin/bash /usr/bin/pacman-key --init'
100+
@IF ERRORLEVEL 1 PAUSE
101+
95102
@REM next, force update info
96103
@"%cwd%"\usr\bin\pacman -S --needed --force --noconfirm info
97104

@@ -106,7 +113,6 @@
106113
@EXIT 1
107114
)
108115

109-
110116
@REM next, force update pacman
111117
@"%cwd%"\usr\bin\pacman -S --needed --force --noconfirm pacman
112118

0 commit comments

Comments
 (0)