Merge branch 'sdk-installer'

This topic branch brings several enhancements to the SDK installer, triggered by a recent breakage due to upstream changes that require us to manually (re-)initialize pacman's keyring before proceeding. Signed-off-by: Johannes Schindelin <[email protected]>
git-for-windows · Feb 29, 2016 · 5794879 · 5794879
2 parents 3455521 + e071e67
commit 5794879
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/sdk-installer/release.sh b/sdk-installer/release.sh
@@ -70,8 +70,11 @@ dlls_for_exes () {
 	echo "$dlls"
 }
 
-fileList="etc/pacman.conf \
+fileList="etc/nsswitch.conf \
+	etc/pacman.conf \
 	etc/pacman.d \
+	usr/bin/pacman-key \
+	usr/bin/tput.exe \
 	usr/bin/pacman.exe \
 	usr/bin/curl.exe \
 	usr/bin/gpg.exe \

diff --git a/sdk-installer/setup-git-sdk.bat b/sdk-installer/setup-git-sdk.bat
@@ -71,6 +71,39 @@
 
 @IF ERRORLEVEL 1 GOTO INSTALL_RUNTIME
 
+@SET /A counter=0
+:INSTALL_BASH
+@SET /A counter+=1
+@IF %counter% GEQ 5 @(
+	@ECHO Could not install bash
+	@PAUSE
+	@EXIT 1
+)
+
+@REM next, force update bash
+@"%cwd%"\usr\bin\pacman -S --needed --force --noconfirm bash
+
+@SET /A counter=0
+:INSTALL_INFO
+@SET /A counter+=1
+@IF %counter% GEQ 5 @(
+	@ECHO Could not install info
+	@PAUSE
+	@EXIT 1
+)
+
+@REM we need a /tmp directory, just for the time being
+@MKDIR "%cwd%"\tmp
+
+@REM next, initialize pacman's keyring
+@"%cwd%"\usr\bin\bash.exe -l -c '/usr/bin/bash /usr/bin/pacman-key --init'
+@IF ERRORLEVEL 1 PAUSE
+
+@REM next, force update info
+@"%cwd%"\usr\bin\pacman -S --needed --force --noconfirm info
+
+@IF ERRORLEVEL 1 GOTO INSTALL_INFO
+
 @SET /A counter=0
 :INSTALL_PACMAN
 @SET /A counter+=1
@@ -80,8 +113,8 @@
 	@EXIT 1
 )
 
-@REM next, force update pacman, but first we need bash and info for that.
-@"%cwd%"\usr\bin\pacman -S --needed --force --noconfirm bash info pacman
+@REM next, force update pacman
+@"%cwd%"\usr\bin\pacman -S --needed --force --noconfirm pacman
 
 @IF ERRORLEVEL 1 GOTO INSTALL_PACMAN