Skip to content

Commit 79fc676

Browse files
committed
sdk-installer: install bash first, then info, and finally pacman
Both bash and info are actually dependencies of pacman, but we need the Bash before installing pacman because several of pacman's dependencies require the Bash in their post-install scripts. Likewise, `makeinfo` is required for several of pacman's dependencies' post-install scripts (e.g. gettext), therefore we install that one next. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent cca4b1f commit 79fc676

File tree

1 file changed

+29
-2
lines changed

1 file changed

+29
-2
lines changed

sdk-installer/setup-git-sdk.bat

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,32 @@
7171

7272
@IF ERRORLEVEL 1 GOTO INSTALL_RUNTIME
7373

74+
@SET /A counter=0
75+
:INSTALL_BASH
76+
@SET /A counter+=1
77+
@IF %counter% GEQ 5 @(
78+
@ECHO Could not install bash
79+
@PAUSE
80+
@EXIT 1
81+
)
82+
83+
@REM next, force update bash
84+
@"%cwd%"\usr\bin\pacman -S --needed --force --noconfirm bash
85+
86+
@SET /A counter=0
87+
:INSTALL_INFO
88+
@SET /A counter+=1
89+
@IF %counter% GEQ 5 @(
90+
@ECHO Could not install info
91+
@PAUSE
92+
@EXIT 1
93+
)
94+
95+
@REM next, force update info
96+
@"%cwd%"\usr\bin\pacman -S --needed --force --noconfirm info
97+
98+
@IF ERRORLEVEL 1 GOTO INSTALL_INFO
99+
74100
@SET /A counter=0
75101
:INSTALL_PACMAN
76102
@SET /A counter+=1
@@ -80,8 +106,9 @@
80106
@EXIT 1
81107
)
82108

83-
@REM next, force update pacman, but first we need bash and info for that.
84-
@"%cwd%"\usr\bin\pacman -S --needed --force --noconfirm bash info pacman
109+
110+
@REM next, force update pacman
111+
@"%cwd%"\usr\bin\pacman -S --needed --force --noconfirm pacman
85112

86113
@IF ERRORLEVEL 1 GOTO INSTALL_PACMAN
87114

0 commit comments

Comments
 (0)