Skip to content

Commit 58c654f

Browse files
committed
install-inside-msys2-proper: convert code blocks to proper Markdown
This commit is best viewed with `-w -I '^ *```$'` (in which case the diff is empty). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent aa2adb9 commit 58c654f

File tree

1 file changed

+30
-16
lines changed

1 file changed

+30
-16
lines changed

content/install-inside-msys2-proper.md

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,47 +16,61 @@ Here are the steps to install the 64-bit version of Git for Windows to be run in
1616

1717
1. Edit `/etc/pacman.conf` and add the Git for Windows package repositories above any others (i.e. just before `[mingw32]` on line #71 as of this writing):
1818

19-
[git-for-windows]
20-
Server = https://wingit.blob.core.windows.net/x86-64
19+
```
20+
[git-for-windows]
21+
Server = https://wingit.blob.core.windows.net/x86-64
2122
22-
[git-for-windows-mingw32]
23-
Server = https://wingit.blob.core.windows.net/i686
23+
[git-for-windows-mingw32]
24+
Server = https://wingit.blob.core.windows.net/i686
25+
```
2426
2527
(The above is correct. The second, MINGW-only repository is for the other architecture.)
2628
2729
This step can be done with the following `sed` command (make sure to do proper backup before trying it):
2830
29-
sed -i '/^\[mingw32\]/{ s|^|[git-for-windows]\nServer = https://wingit.blob.core.windows.net/x86-64\n\n[git-for-windows-mingw32]\nServer = https://wingit.blob.core.windows.net/i686\n\n|; }' /etc/pacman.conf
31+
```
32+
sed -i '/^\[mingw32\]/{ s|^|[git-for-windows]\nServer = https://wingit.blob.core.windows.net/x86-64\n\n[git-for-windows-mingw32]\nServer = https://wingit.blob.core.windows.net/i686\n\n|; }' /etc/pacman.conf
33+
```
3034
3135
To avoid the future signature related issues, run the following commands first
3236
33-
rm -r /etc/pacman.d/gnupg/
34-
pacman-key --init
35-
pacman-key --populate msys2
37+
```
38+
rm -r /etc/pacman.d/gnupg/
39+
pacman-key --init
40+
pacman-key --populate msys2
41+
```
3642
3743
2. Authorize the signing key with:
3844
39-
curl -L https://raw.githubusercontent.com/git-for-windows/build-extra/HEAD/git-for-windows-keyring/git-for-windows.gpg |
40-
pacman-key --add - &&
41-
pacman-key --lsign-key E8325679DFFF09668AD8D7B67115A57376871B1C &&
42-
pacman-key --lsign-key 3B6D86A1BA7701CD0F23AED888138B9E1A9F3986
45+
```
46+
curl -L https://raw.githubusercontent.com/git-for-windows/build-extra/HEAD/git-for-windows-keyring/git-for-windows.gpg |
47+
pacman-key --add - &&
48+
pacman-key --lsign-key E8325679DFFF09668AD8D7B67115A57376871B1C &&
49+
pacman-key --lsign-key 3B6D86A1BA7701CD0F23AED888138B9E1A9F3986
50+
```
4351
4452
3. Then synchronize with new repositories with
4553
46-
pacman -Syyuu
54+
```
55+
pacman -Syyuu
56+
```
4757
48-
This installs a new `msys2-runtime` and therefore will ask you to terminate all MSYS2 processes. Save what you need from other open MSYS2 shells and programs, exit them and confirm the Pacman prompt.
58+
This installs a new `msys2-runtime` and therefore will ask you to terminate all MSYS2 processes. Save what you need from other open MSYS2 shells and programs, exit them and confirm the Pacman prompt.
4959
Double-check Task Manager and kill `pacman.exe` if it's still running after the window is closed. Start a new MSYS2 terminal.
5060
5161
4. Then synchronize *again* to install the rest:
5262
53-
pacman -Suu
63+
```
64+
pacman -Suu
65+
```
5466
5567
It might happen that some packages are downgraded, this is expected.
5668
5769
5. And finally install the packages containing Git, its documentation and some extra things:
5870
59-
pacman -S mingw-w64-x86_64-{git,git-doc-html,git-doc-man} mingw-w64-x86_64-git-extra
71+
```
72+
pacman -S mingw-w64-x86_64-{git,git-doc-html,git-doc-man} mingw-w64-x86_64-git-extra
73+
```
6074
6175
Now you can close the current shell and open a MINGW64 shell (`msys2_shell.cmd -mingw64`) to check that everything went well. Run `git --version` and it should output something like `git version 2.31.0.windows.1` (or newer).
6276

0 commit comments

Comments
 (0)