extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2025-01-07 06:58:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into conditional-style

Browse Source
This commit is contained in:
Filip Bachul 2023-02-09 09:35:13 +01:00
commit 4a3d941357
11 changed files with 54 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/config-schema.json vendored
View File

@ -1151,6 +1151,7 @@
"NetBSD": "🚩 ",
"NixOS": "❄️ ",
"OpenBSD": "🐡 ",
"OpenCloudOS": "☁️ ",
"OracleLinux": "🦴 ",
"Pop": "🍭 ",
"Raspbian": "🍓 ",
@ -1162,6 +1163,7 @@
"Ubuntu": "🎯 ",
"Unknown": "❓ ",
"Windows": "🪟 ",
"openEuler": "🦉 ",
"openSUSE": "🦎 "
}
},
@ -4479,6 +4481,7 @@
"NetBSD": "🚩 ",
"NixOS": "❄️ ",
"OpenBSD": "🐡 ",
"OpenCloudOS": "☁️ ",
"OracleLinux": "🦴 ",
"Pop": "🍭 ",
"Raspbian": "🍓 ",
@ -4490,6 +4493,7 @@
"Ubuntu": "🎯 ",
"Unknown": "❓ ",
"Windows": "🪟 ",
"openEuler": "🦉 ",
"openSUSE": "🦎 "
},
"type": "object",

2
.github/renovate.json5 vendored
View File

@ -9,11 +9,13 @@
"workarounds:all",
// automerge minor updates
":automergeMinor",
":automergeBranch"
],
"labels": ["📦 dependencies"],
"semanticCommits": "enabled",
"semanticCommitType": "build",
"rangeStrategy": "bump",
"rebaseWhen": "conflicted",
"packageRules": [
// group updates to related packages
{

2
.github/workflows/workflow.yml vendored
View File

@ -1,8 +1,6 @@
name: Main workflow
on:
push:
branches:
- master
paths-ignore:
- "docs/**"
- "**.md"

34
Cargo.lock generated
View File

@ -1988,9 +1988,9 @@ dependencies = [
[[package]]
name = "os_info"
version = "3.5.1"
version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f"
checksum = "5c424bc68d15e0778838ac013b5b3449544d8133633d8016319e7e05a820b8c0"
dependencies = [
"log",
"serde",
@ -2093,9 +2093,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]]
name = "pest"
version = "2.5.4"
version = "2.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f"
checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660"
dependencies = [
"thiserror",
"ucd-trie",
@ -2103,9 +2103,9 @@ dependencies = [
[[package]]
name = "pest_derive"
version = "2.5.4"
version = "2.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea"
checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69"
dependencies = [
"pest",
"pest_generator",
@ -2113,9 +2113,9 @@ dependencies = [
[[package]]
name = "pest_generator"
version = "2.5.4"
version = "2.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f"
checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202"
dependencies = [
"pest",
"pest_meta",
@ -2126,9 +2126,9 @@ dependencies = [
[[package]]
name = "pest_meta"
version = "2.5.4"
version = "2.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d"
checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616"
dependencies = [
"once_cell",
"pest",
@ -2630,9 +2630,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.92"
version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a"
checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
dependencies = [
"itoa",
"ryu",
@ -2842,7 +2842,7 @@ dependencies = [
"systemstat",
"tempfile",
"terminal_size",
"toml 0.7.1",
"toml 0.7.2",
"toml_edit",
"unicode-segmentation",
"unicode-width",
@ -3097,9 +3097,9 @@ dependencies = [
[[package]]
name = "toml"
version = "0.7.1"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "772c1426ab886e7362aedf4abc9c0d1348a979517efedfc25862944d10137af0"
checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6"
dependencies = [
"indexmap",
"serde",
@ -3119,9 +3119,9 @@ dependencies = [
[[package]]
name = "toml_edit"
version = "0.19.1"
version = "0.19.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90a238ee2e6ede22fb95350acc78e21dc40da00bb66c0334bde83de4ed89424e"
checksum = "5e6a7712b49e1775fb9a7b998de6635b299237f48b404dde71704f2e0e7f37e5"
dependencies = [
"indexmap",
"nom8",

12
Cargo.toml
View File

@ -60,10 +60,10 @@ nu-ansi-term = "0.46.0"
once_cell = "1.17.0"
open = "3.2.0"
# update os module config and tests when upgrading os_info
os_info = "3.5.1"
os_info = "3.6.0"
path-slash = "0.2.1"
pest = "2.5.4"
pest_derive = "2.5.4"
pest = "2.5.5"
pest_derive = "2.5.5"
quick-xml = "0.27.1"
rand = "0.8.5"
rayon = "1.6.1"
@ -71,7 +71,7 @@ regex = "1.7.1"
rust-ini = "0.18.0"
semver = "1.0.16"
serde = { version = "1.0.152", features = ["derive"] }
serde_json = "1.0.92"
serde_json = "1.0.93"
sha1 = "0.10.5"
shadow-rs = { version = "0.20.0", default-features = false }
# battery is optional (on by default) because the crate doesn't currently build for Termux
@ -80,8 +80,8 @@ starship-battery = { version = "0.7.9", optional = true }
strsim = "0.10.0"
systemstat = "=0.2.3"
terminal_size = "0.2.3"
toml = { version = "0.7.1", features = ["preserve_order"] }
toml_edit = "0.19.1"
toml = { version = "0.7.2", features = ["preserve_order"] }
toml_edit = "0.19.3"
unicode-segmentation = "1.10.1"
unicode-width = "0.1.10"
urlencoding = "2.1.2"

2
README.md
View File

@ -169,7 +169,7 @@
### Prerequisites
- A [Nerd Font](https://www.nerdfonts.com/) installed and enabled in your terminal (for example, try the [Fira Code Nerd Font](https://www.nerdfonts.com/font-downloads)).
- A [Nerd Font](https://www.nerdfonts.com/) installed and enabled in your terminal (for example, try the [FiraCode Nerd Font](https://www.nerdfonts.com/font-downloads)).
### Step 1. Install Starship

2
docs/.vuepress/public/presets/toml/plain-text-symbols.toml
View File

@ -137,6 +137,8 @@ Mint = "mint "
NetBSD = "nbsd "
NixOS = "nix "
OpenBSD = "obsd "
OpenCloudOS = "ocos "
openEuler = "oeul "
openSUSE = "osuse "
OracleLinux = "orac "
Pop = "pop "

32
docs/config/README.md
View File

@ -46,7 +46,7 @@ os.setenv('STARSHIP_CONFIG', 'C:\\Users\\user\\example\\non\\default\\path\\star
### Logging
By default starship logs warnings and errors into a file named `~/.cache/starship/session_${STARSHIP_SESSION_KEY}.log`, where the session key is corresponding to a instance of your terminal.
By default starship logs warnings and errors into a file named `~/.cache/starship/session_${STARSHIP_SESSION_KEY}.log`, where the session key is corresponding to an instance of your terminal.
This, however can be changed using the `STARSHIP_CACHE` environment variable:
```sh
@ -1144,7 +1144,7 @@ prefixes or development directories (i.e. Java). Note that this will disable the
`fish_style_pwd_dir_length` interacts with the standard truncation options in a way that can be surprising at first: if it's non-zero,
the components of the path that would normally be truncated are instead displayed with that many characters. For example, the path
`/built/this/city/on/rock/and/roll`, which would normally be displayed as as `rock/and/roll`, would be displayed as
`/built/this/city/on/rock/and/roll`, which would normally be displayed as `rock/and/roll`, would be displayed as
`/b/t/c/o/rock/and/roll` with `fish_style_pwd_dir_length = 1`--the path components that would normally be removed are displayed with
a single character. For `fish_style_pwd_dir_length = 2`, it would be `/bu/th/ci/on/rock/and/roll`.
@ -3028,6 +3028,8 @@ Mint = "🌿 "
NetBSD = "🚩 "
NixOS = "❄️ "
OpenBSD = "🐡 "
OpenCloudOS = "☁️ "
openEuler = "🦉 "
openSUSE = "🦎 "
OracleLinux = "🦴 "
Pop = "🍭 "
@ -3867,18 +3869,18 @@ To enable it, set `disabled` to `false` in your configuration file.
### Variables
| Variable | Example | Description |
| -------------- | ------- | ------------------------------------------------------------------------------------------- |
| status | `127` | The exit code of the last command |
| hex_status | `0x7F` | The exit code of the last command in hex |
| int | `127` | The exit code of the last command |
| common_meaning | `ERROR` | Meaning of the code if not a signal |
| signal_number | `9` | Signal number corresponding to the exit code, only if signalled |
| signal_name | `KILL` | Name of the signal corresponding to the exit code, only if signalled |
| maybe_int | `7` | Contains the exit code number when no meaning has been found |
| pipestatus | | Rendering of in pipeline programs's exit codes, this is only available in pipestatus_format |
| symbol | | Mirrors the value of option `symbol` |
| style\* | | Mirrors the value of option `style` |
| Variable | Example | Description |
| -------------- | ------- | ------------------------------------------------------------------------------------------ |
| status | `127` | The exit code of the last command |
| hex_status | `0x7F` | The exit code of the last command in hex |
| int | `127` | The exit code of the last command |
| common_meaning | `ERROR` | Meaning of the code if not a signal |
| signal_number | `9` | Signal number corresponding to the exit code, only if signalled |
| signal_name | `KILL` | Name of the signal corresponding to the exit code, only if signalled |
| maybe_int | `7` | Contains the exit code number when no meaning has been found |
| pipestatus | | Rendering of in pipeline programs' exit codes, this is only available in pipestatus_format |
| symbol | | Mirrors the value of option `symbol` |
| style\* | | Mirrors the value of option `style` |
*: This variable can only be used as a part of a style string
@ -4255,7 +4257,7 @@ format = '[🆅 $repo](bold blue) '
## Zig
By default the the `zig` module shows the currently installed version of [Zig](https://ziglang.org/).
By default the `zig` module shows the currently installed version of [Zig](https://ziglang.org/).
The module will be shown if any of the following conditions are met:
- The current directory contains a `.zig` file

2
docs/faq/README.md
View File

@ -96,7 +96,7 @@ This will output the trace log and a breakdown of all modules that either took
more than 1ms to execute or produced some output.
Finally if you find a bug you can use the `bug-report` command to create a
Github issue.
GitHub issue.
```sh
starship bug-report

2
src/configs/os.rs
View File

@ -52,6 +52,8 @@ impl<'a> Default for OSConfig<'a> {
Type::NetBSD => "🚩 ",
Type::NixOS => "❄️ ",
Type::OpenBSD => "🐡 ",
Type::OpenCloudOS => "☁️ ",
Type::openEuler => "🦉 ",
Type::openSUSE => "🦎 ",
Type::OracleLinux => "🦴 ",
Type::Pop => "🍭 ",

2
src/modules/os.rs
View File

@ -355,6 +355,8 @@ mod tests {
Type::NetBSD => "🚩 ",
Type::NixOS => "❄️ ",
Type::OpenBSD => "🐡 ",
Type::OpenCloudOS => "☁️ ",
Type::openEuler => "🦉 ",
Type::openSUSE => "🦎 ",
Type::OracleLinux => "🦴 ",
Type::Pop => "🍭 ",