mirror of
https://github.com/sharkdp/bat
synced 2024-09-06 17:06:07 +00:00
Merge the v0.18.3 hotfix release into master
The v0.18.3 release was a hotfix release to make bat build again with Rust 1.54.
This merge commit brings in all changes from the hotfix release into the master
branch.
In practice, this only brings in one new commit, namely b146958ec
. The other
three commits in the release were cherry-picks from master.
This commit is contained in:
commit
b3247d9364
|
@ -32,6 +32,13 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# v0.18.3
|
||||||
|
|
||||||
|
## Bugfixes
|
||||||
|
|
||||||
|
- Bump `git2` dependency to fix build with Rust 1.54, see #1761
|
||||||
|
|
||||||
|
|
||||||
# v0.18.2
|
# v0.18.2
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
2
Cargo.lock
generated
2
Cargo.lock
generated
|
@ -83,7 +83,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bat"
|
name = "bat"
|
||||||
version = "0.18.2"
|
version = "0.18.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ansi_colours",
|
"ansi_colours",
|
||||||
"ansi_term 0.12.1",
|
"ansi_term 0.12.1",
|
||||||
|
|
|
@ -6,7 +6,7 @@ homepage = "https://github.com/sharkdp/bat"
|
||||||
license = "MIT/Apache-2.0"
|
license = "MIT/Apache-2.0"
|
||||||
name = "bat"
|
name = "bat"
|
||||||
repository = "https://github.com/sharkdp/bat"
|
repository = "https://github.com/sharkdp/bat"
|
||||||
version = "0.18.2"
|
version = "0.18.3"
|
||||||
exclude = ["assets/syntaxes/*", "assets/themes/*"]
|
exclude = ["assets/syntaxes/*", "assets/themes/*"]
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
edition = '2018'
|
edition = '2018'
|
||||||
|
|
|
@ -222,7 +222,7 @@ the most recent release of `bat`, download the latest `.deb` package from the
|
||||||
[release page](https://github.com/sharkdp/bat/releases) and install it via:
|
[release page](https://github.com/sharkdp/bat/releases) and install it via:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo dpkg -i bat_0.18.2_amd64.deb # adapt version number and architecture
|
sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture
|
||||||
```
|
```
|
||||||
|
|
||||||
### On Alpine Linux
|
### On Alpine Linux
|
||||||
|
|
|
@ -202,7 +202,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
|
||||||
batの最新リリースを実行する場合、または Ubuntu/Debian の古いバージョンを使用している場合は、[release page](https://github.com/sharkdp/bat/releases) から最新の `.deb` パッケージをダウンロードし、
|
batの最新リリースを実行する場合、または Ubuntu/Debian の古いバージョンを使用している場合は、[release page](https://github.com/sharkdp/bat/releases) から最新の `.deb` パッケージをダウンロードし、
|
||||||
次の方法でインストールします:
|
次の方法でインストールします:
|
||||||
```bash
|
```bash
|
||||||
sudo dpkg -i bat_0.18.2_amd64.deb # adapt version number and architecture
|
sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture
|
||||||
```
|
```
|
||||||
|
|
||||||
### On Alpine Linux
|
### On Alpine Linux
|
||||||
|
|
|
@ -244,7 +244,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
|
||||||
다음과 같이 `.deb` 패키지를 받아 설치하세요:
|
다음과 같이 `.deb` 패키지를 받아 설치하세요:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo dpkg -i bat_0.18.2_amd64.deb # adapt version number and architecture
|
sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture
|
||||||
```
|
```
|
||||||
|
|
||||||
### Alpine Linux에서
|
### Alpine Linux에서
|
||||||
|
|
|
@ -185,7 +185,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
|
||||||
[release page](https://github.com/sharkdp/bat/releases) и установить так:
|
[release page](https://github.com/sharkdp/bat/releases) и установить так:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo dpkg -i bat_0.18.2_amd64.deb # измените архитектуру и версию
|
sudo dpkg -i bat_0.18.3_amd64.deb # измените архитектуру и версию
|
||||||
```
|
```
|
||||||
|
|
||||||
### Alpine Linux
|
### Alpine Linux
|
||||||
|
|
Loading…
Reference in a new issue