Skip to content

Commit c5d4264

Browse files
authored
init-msys2.bat: fix catgets conflict
1 parent b1ff85d commit c5d4264

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

init-msys2.bat

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ busybox tar -Jxvf msys2-x86_64-latest.tar.xz
2424
%sh% -lc "pacman-key --init && exit" 2>&1 | busybox tee -a init.log
2525

2626
:Chi_Mirror
27-
for %%i in ( mirrorlist.mingw32 mirrorlist.mingw64 mirrorlist.msys) do if exist %%i copy /y %%i msys64\etc\pacman.d\
27+
for %%i in (mirrorlist.mingw32 mirrorlist.mingw64 mirrorlist.msys) do if exist %%i copy /y %%i msys64\etc\pacman.d\
2828

2929
:Update
30-
%pacman% -Syyuu --needed --noconfirm 2>&1 | busybox tee -a update.log
31-
%pacman% -Suu --needed --noconfirm 2>&1 | busybox tee -a update.log
30+
%pacman% -Syyuu --needed --noconfirm --ask=20 2>&1 | busybox tee -a update.log
31+
%pacman% -Suu --needed --noconfirm --ask=20 2>&1 | busybox tee -a update.log
3232

3333
:Install
3434
%pacman% -S --needed --noconfirm base-devel zlib-devel sqlite git unzip zip tar gmp gmp-devel libssh2 libssh2-devel openssl-devel 2>&1 | busybox tee -a install.log
3535
%pacman% -Sc --noconfirm 2>&1 | busybox tee -a install.log
3636

3737
:Clone
38-
%sh% -lc "if [[ -d ~/aria2 ]]; then cd aria2; git pull; else git clone https://gist.github.com/a780c730b7282e090f238e8286f815f3.git aria2; cd aria2; git pull; fi" 2>&1 | busybox tee -a clone.log
38+
%sh% -lc "if [[ -d ~/aria2 ]]; then cd aria2; git pull; else git clone https://github.com/myfreeer/aria2-build-msys2.git aria2; cd aria2; git pull; fi" 2>&1 | busybox tee -a clone.log
3939

4040
:Build
4141
%sh% -lc "cd ~/aria2 && exec ./build-aria2.sh" 2>&1 | busybox tee -a build.log
42-
pause
42+
pause

0 commit comments

Comments
 (0)