extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2024-12-14 03:00:53 +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-03-20 21:27:02 +01:00
commit 9acded91d4
15 changed files with 215 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

270
Cargo.lock generated
View File

@ -130,7 +130,7 @@ checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -147,7 +147,7 @@ checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -168,6 +168,12 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5dd14596c0e5b954530d0e6f1fd99b89c03e313aa2086e8da4303701a09e1cf"
[[package]] [[package]]
name = "block" name = "block"
version = "0.1.6" version = "0.1.6"
@ -251,9 +257,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.23" version = "0.4.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
dependencies = [ dependencies = [
"iana-time-zone", "iana-time-zone",
"js-sys", "js-sys",
@ -265,11 +271,11 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.1.8" version = "4.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098"
dependencies = [ dependencies = [
"bitflags", "bitflags 2.0.1",
"clap_derive", "clap_derive",
"clap_lex", "clap_lex",
"is-terminal", "is-terminal",
@ -282,24 +288,24 @@ dependencies = [
[[package]] [[package]]
name = "clap_complete" name = "clap_complete"
version = "4.1.4" version = "4.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501ff0a401473ea1d4c3b125ff95506b62c5bc5768d818634195fbb7c4ad5ff4" checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1"
dependencies = [ dependencies = [
"clap", "clap",
] ]
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "4.1.8" version = "4.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644"
dependencies = [ dependencies = [
"heck 0.4.0", "heck 0.4.0",
"proc-macro-error", "proc-macro-error",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -496,7 +502,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -623,7 +629,7 @@ checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -836,9 +842,9 @@ dependencies = [
[[package]] [[package]]
name = "gix" name = "gix"
version = "0.39.0" version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dabfac58aecb4a38cdd2568de66eb1f0d968fd6726f5a80cb8bea7944ef10cc0" checksum = "fd5e0d9c5df90c9b4d325ec716762beb7d6c1465a4049fec5c4f6b72e7824656"
dependencies = [ dependencies = [
"gix-actor", "gix-actor",
"gix-attributes", "gix-attributes",
@ -934,9 +940,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-config" name = "gix-config"
version = "0.18.0" version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52c62e26ce11f607712e4f49a0a192ed87675d30187fd61be070abbd607d12f1" checksum = "6aa7d7dd60256b7a0c0506a1d708ec92767c2662ee57b3301b538eaa3e064f8a"
dependencies = [ dependencies = [
"bstr", "bstr",
"gix-config-value", "gix-config-value",
@ -959,7 +965,7 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "693d4a4ba0531e46fe558459557a5b29fb86c3e4b2666c1c0861d93c7c678331" checksum = "693d4a4ba0531e46fe558459557a5b29fb86c3e4b2666c1c0861d93c7c678331"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
"bstr", "bstr",
"gix-path", "gix-path",
"libc", "libc",
@ -968,9 +974,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-credentials" name = "gix-credentials"
version = "0.11.0" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5be32b5fe339a31b8e53fa854081dc914c45020dcb64637f3c21baf69c96fc1b" checksum = "750b684197374518ea057e0a0594713e07683faa0a3f43c0f93d97f64130ad8d"
dependencies = [ dependencies = [
"bstr", "bstr",
"gix-command", "gix-command",
@ -1008,9 +1014,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-discover" name = "gix-discover"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91c204adba5ebd211c74735cbb65817d277e154486bac0dffa3701f163b80350" checksum = "1b58931ab475a977deff03417e041a66e4bcb76c4e5797e7ec2fcb272ebce01c"
dependencies = [ dependencies = [
"bstr", "bstr",
"dunce", "dunce",
@ -1023,9 +1029,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-features" name = "gix-features"
version = "0.28.0" version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e6a9dfa7b3c1a99315203e8b97f8f99f3bd95731590607abeaa5ca31bc41fe3" checksum = "0b76f9a80f6dd7be66442ae86e1f534effad9546676a392acc95e269d0c21c22"
dependencies = [ dependencies = [
"crc32fast", "crc32fast",
"crossbeam-channel", "crossbeam-channel",
@ -1048,7 +1054,7 @@ version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993" checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
"bstr", "bstr",
] ]
@ -1075,11 +1081,11 @@ dependencies = [
[[package]] [[package]]
name = "gix-index" name = "gix-index"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c12caf7886c7ba06f2b28835cdc2be1dca86bd047d00299d2d49e707ce1c2616" checksum = "546ee7855d5d8731288f05a63c07ab41b59cb406660a825ed3fe89d7223823df"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
"bstr", "bstr",
"btoi", "btoi",
"filetime", "filetime",
@ -1097,9 +1103,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-lock" name = "gix-lock"
version = "4.0.0" version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66119ff8a4a395d0ea033fef718bc85f8b4f0855874f4ce1e005fc16cfe1f66e" checksum = "41b80172055c5d8017a48ddac5cc7a95421c00211047db0165c97853c4f05194"
dependencies = [ dependencies = [
"fastrand", "fastrand",
"gix-tempfile", "gix-tempfile",
@ -1138,9 +1144,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-odb" name = "gix-odb"
version = "0.42.0" version = "0.43.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9a5f9e1afbd509761977a2ea02869cedaaba500b4e783deb2e4de5179a55a80" checksum = "aa63fce01e5bce663bb24ad01fa2b77266e91b1d1982aab3f67cb0aed8af8169"
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"gix-features", "gix-features",
@ -1156,9 +1162,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-pack" name = "gix-pack"
version = "0.32.0" version = "0.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51db84e1459a8022e518d40a8778028d793dbb28e4d35c9a5eaf92658fb0775" checksum = "e122e8e688313bdbd7ea40631beea562a56211e351ad24739fe412ab6df4e4b7"
dependencies = [ dependencies = [
"clru", "clru",
"gix-chunk", "gix-chunk",
@ -1213,9 +1219,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-ref" name = "gix-ref"
version = "0.26.0" version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90a0ed29e581f04b904ecd0c32b11f33b8209b5a0af9c43f415249a4f2fba632" checksum = "0949e07aa4ed00a5936c2f4529013540708f367906f542cf19db814957e80449"
dependencies = [ dependencies = [
"gix-actor", "gix-actor",
"gix-features", "gix-features",
@ -1264,7 +1270,7 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47" checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
"dirs 4.0.0", "dirs 4.0.0",
"gix-path", "gix-path",
"libc", "libc",
@ -1273,9 +1279,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-tempfile" name = "gix-tempfile"
version = "4.1.0" version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8e0227bd284cd16105e8479602bb8af6bddcb800427e881c1feee4806310a31" checksum = "743bae41b5db7f085dc7acc54ed72c98853a6e5dabb355e95caa7b534f21b35c"
dependencies = [ dependencies = [
"libc", "libc",
"once_cell", "once_cell",
@ -1299,9 +1305,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-url" name = "gix-url"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "044072b7ce8601b62dcec841b92129f5cc677072823324121b395d766ac5f528" checksum = "b6a22b4b32ad14d68f7b7fb6458fa58d44b01797d94c1b8f4db2d9c7b3c366b5"
dependencies = [ dependencies = [
"bstr", "bstr",
"gix-features", "gix-features",
@ -1323,9 +1329,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-worktree" name = "gix-worktree"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7cb9af6e56152953d8fe113c4f9d7cf60cf7a982362711e9200a255579b49cb" checksum = "992b8fdade33e079dc61c29f2388ab8e049965ebf7be40efa7f8b80e3c4543fe"
dependencies = [ dependencies = [
"bstr", "bstr",
"gix-attributes", "gix-attributes",
@ -1716,7 +1722,7 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -1725,7 +1731,7 @@ version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
"cc", "cc",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"libc", "libc",
@ -1739,7 +1745,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"bitflags", "bitflags 1.3.2",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"libc", "libc",
"memoffset", "memoffset",
@ -1752,7 +1758,7 @@ version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"libc", "libc",
"static_assertions", "static_assertions",
@ -1799,12 +1805,11 @@ dependencies = [
[[package]] [[package]]
name = "nu-ansi-term" name = "nu-ansi-term"
version = "0.46.0" version = "0.47.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" checksum = "1df031e117bca634c262e9bd3173776844b6c17a90b3741c9163663b4385af76"
dependencies = [ dependencies = [
"overload", "windows-sys 0.45.0",
"winapi",
] ]
[[package]] [[package]]
@ -1815,7 +1820,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -1899,9 +1904,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]] [[package]]
name = "open" name = "open"
version = "3.4.0" version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21ecf2487e799604735754d2c5896106785987b441b5aee58f242e4d4963179a" checksum = "bd61e3bf9d78956c72ee864bba52431f7f43994b21a17e9e72596a81bd61075b"
dependencies = [ dependencies = [
"pathdiff", "pathdiff",
] ]
@ -1952,12 +1957,6 @@ version = "6.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
[[package]]
name = "overload"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]] [[package]]
name = "parking" name = "parking"
version = "2.0.0" version = "2.0.0"
@ -2045,7 +2044,7 @@ dependencies = [
"pest_meta", "pest_meta",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -2185,7 +2184,7 @@ dependencies = [
"proc-macro-error-attr", "proc-macro-error-attr",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
"version_check", "version_check",
] ]
@ -2202,9 +2201,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.47" version = "1.0.52"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -2238,18 +2237,18 @@ dependencies = [
[[package]] [[package]]
name = "quick-xml" name = "quick-xml"
version = "0.27.1" version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" checksum = "e5c1a97b1bc42b1d550bfb48d4262153fe400a12bab1511821736f7eac76d7e2"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.21" version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
] ]
@ -2363,7 +2362,7 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
] ]
[[package]] [[package]]
@ -2416,7 +2415,7 @@ version = "0.36.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
"errno", "errno",
"io-lifetimes", "io-lifetimes",
"libc", "libc",
@ -2461,7 +2460,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde_derive_internals", "serde_derive_internals",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -2481,9 +2480,9 @@ dependencies = [
[[package]] [[package]]
name = "semver" name = "semver"
version = "1.0.16" version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]] [[package]]
name = "semver-parser" name = "semver-parser"
@ -2496,22 +2495,22 @@ dependencies = [
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.152" version = "1.0.158"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.152" version = "1.0.158"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 2.0.3",
] ]
[[package]] [[package]]
@ -2522,7 +2521,7 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -2544,7 +2543,7 @@ checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -2722,13 +2721,13 @@ dependencies = [
"pest", "pest",
"pest_derive", "pest_derive",
"process_control", "process_control",
"quick-xml 0.27.1", "quick-xml 0.28.1",
"rand 0.8.5", "rand 0.8.5",
"rayon", "rayon",
"regex", "regex",
"rust-ini", "rust-ini",
"schemars", "schemars",
"semver 1.0.16", "semver 1.0.17",
"serde", "serde",
"serde_json", "serde_json",
"sha1", "sha1",
@ -2739,14 +2738,14 @@ dependencies = [
"systemstat", "systemstat",
"tempfile", "tempfile",
"terminal_size", "terminal_size",
"toml 0.7.2", "toml 0.7.3",
"toml_edit", "toml_edit",
"unicode-segmentation", "unicode-segmentation",
"unicode-width", "unicode-width",
"urlencoding", "urlencoding",
"versions", "versions",
"which", "which",
"windows 0.44.0", "windows 0.46.0",
"winres", "winres",
"yaml-rust", "yaml-rust",
] ]
@ -2798,7 +2797,7 @@ dependencies = [
"heck 0.3.3", "heck 0.3.3",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -2812,6 +2811,17 @@ dependencies = [
"unicode-ident", "unicode-ident",
] ]
[[package]]
name = "syn"
version = "2.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8234ae35e70582bfa0f1fedffa6daa248e41dd045310b19800c4a36382c8f60"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]] [[package]]
name = "systemstat" name = "systemstat"
version = "0.2.3" version = "0.2.3"
@ -2905,7 +2915,7 @@ checksum = "31ef6892cc0348a9b3b8c377addba91e0f6365863d92354bf27559dca81ee8c5"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
"bitflags", "bitflags 1.3.2",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"filedescriptor", "filedescriptor",
"hex", "hex",
@ -2946,7 +2956,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -3004,9 +3014,9 @@ dependencies = [
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.7.2" version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6" checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"serde", "serde",
@ -3026,9 +3036,9 @@ dependencies = [
[[package]] [[package]]
name = "toml_edit" name = "toml_edit"
version = "0.19.4" version = "0.19.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"serde", "serde",
@ -3057,7 +3067,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -3269,7 +3279,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -3291,7 +3301,7 @@ checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -3373,19 +3383,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
dependencies = [ dependencies = [
"windows_aarch64_gnullvm", "windows_aarch64_gnullvm",
"windows_aarch64_msvc 0.42.1", "windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.1", "windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.1", "windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.1", "windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm", "windows_x86_64_gnullvm",
"windows_x86_64_msvc 0.42.1", "windows_x86_64_msvc 0.42.2",
] ]
[[package]] [[package]]
name = "windows" name = "windows"
version = "0.44.0" version = "0.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
dependencies = [ dependencies = [
"windows-targets", "windows-targets",
] ]
@ -3410,12 +3420,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [ dependencies = [
"windows_aarch64_gnullvm", "windows_aarch64_gnullvm",
"windows_aarch64_msvc 0.42.1", "windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.1", "windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.1", "windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.1", "windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm", "windows_x86_64_gnullvm",
"windows_x86_64_msvc 0.42.1", "windows_x86_64_msvc 0.42.2",
] ]
[[package]] [[package]]
@ -3429,24 +3439,24 @@ dependencies = [
[[package]] [[package]]
name = "windows-targets" name = "windows-targets"
version = "0.42.1" version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [ dependencies = [
"windows_aarch64_gnullvm", "windows_aarch64_gnullvm",
"windows_aarch64_msvc 0.42.1", "windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.1", "windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.1", "windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.1", "windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm", "windows_x86_64_gnullvm",
"windows_x86_64_msvc 0.42.1", "windows_x86_64_msvc 0.42.2",
] ]
[[package]] [[package]]
name = "windows_aarch64_gnullvm" name = "windows_aarch64_gnullvm"
version = "0.42.1" version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]] [[package]]
name = "windows_aarch64_msvc" name = "windows_aarch64_msvc"
@ -3462,9 +3472,9 @@ checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
[[package]] [[package]]
name = "windows_aarch64_msvc" name = "windows_aarch64_msvc"
version = "0.42.1" version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]] [[package]]
name = "windows_i686_gnu" name = "windows_i686_gnu"
@ -3480,9 +3490,9 @@ checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
[[package]] [[package]]
name = "windows_i686_gnu" name = "windows_i686_gnu"
version = "0.42.1" version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]] [[package]]
name = "windows_i686_msvc" name = "windows_i686_msvc"
@ -3498,9 +3508,9 @@ checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
[[package]] [[package]]
name = "windows_i686_msvc" name = "windows_i686_msvc"
version = "0.42.1" version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]] [[package]]
name = "windows_x86_64_gnu" name = "windows_x86_64_gnu"
@ -3516,15 +3526,15 @@ checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
[[package]] [[package]]
name = "windows_x86_64_gnu" name = "windows_x86_64_gnu"
version = "0.42.1" version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]] [[package]]
name = "windows_x86_64_gnullvm" name = "windows_x86_64_gnullvm"
version = "0.42.1" version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]] [[package]]
name = "windows_x86_64_msvc" name = "windows_x86_64_msvc"
@ -3540,9 +3550,9 @@ checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
[[package]] [[package]]
name = "windows_x86_64_msvc" name = "windows_x86_64_msvc"
version = "0.42.1" version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]] [[package]]
name = "winnow" name = "winnow"
@ -3619,7 +3629,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"regex", "regex",
"syn", "syn 1.0.104",
] ]
[[package]] [[package]]
@ -3656,5 +3666,5 @@ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.104",
] ]

26
Cargo.toml
View File

@ -42,35 +42,35 @@ gix-max-perf = ["gix-features/zlib-ng", "gix/fast-sha1"]
gix-faster = ["gix-features/zlib-stock", "gix/fast-sha1"] gix-faster = ["gix-features/zlib-stock", "gix/fast-sha1"]
[dependencies] [dependencies]
chrono = { version = "0.4.23", default-features = false, features = ["clock", "std", "wasmbind"] } chrono = { version = "0.4.24", default-features = false, features = ["clock", "std", "wasmbind"] }
clap = { version = "4.1.8", features = ["derive", "cargo", "unicode"] } clap = { version = "4.1.11", features = ["derive", "cargo", "unicode"] }
clap_complete = "4.1.4" clap_complete = "4.1.5"
dirs-next = "2.0.0" dirs-next = "2.0.0"
dunce = "1.0.3" dunce = "1.0.3"
gethostname = "0.4.1" gethostname = "0.4.1"
# default feature restriction addresses https://github.com/starship/starship/issues/4251 # default feature restriction addresses https://github.com/starship/starship/issues/4251
gix = { version = "0.39.0", default-features = false, features = ["max-performance-safe"] } gix = { version = "0.42.0", default-features = false, features = ["max-performance-safe"] }
gix-features = { version = "0.28.0", optional = true } gix-features = { version = "0.28.1", optional = true }
indexmap = { version = "1.9.2", features = ["serde"] } indexmap = { version = "1.9.2", features = ["serde"] }
log = { version = "0.4.17", features = ["std"] } log = { version = "0.4.17", features = ["std"] }
# nofity-rust is optional (on by default) because the crate doesn't currently build for darwin with nix # nofity-rust is optional (on by default) because the crate doesn't currently build for darwin with nix
# see: https://github.com/NixOS/nixpkgs/issues/160876 # see: https://github.com/NixOS/nixpkgs/issues/160876
notify-rust = { version = "4.8.0", optional = true } notify-rust = { version = "4.8.0", optional = true }
nu-ansi-term = "0.46.0" nu-ansi-term = "0.47.0"
once_cell = "1.17.1" once_cell = "1.17.1"
open = "3.4.0" open = "4.0.0"
# update os module config and tests when upgrading os_info # update os module config and tests when upgrading os_info
os_info = "3.6.0" os_info = "3.6.0"
path-slash = "0.2.1" path-slash = "0.2.1"
pest = "2.5.6" pest = "2.5.6"
pest_derive = "2.5.6" pest_derive = "2.5.6"
quick-xml = "0.27.1" quick-xml = "0.28.1"
rand = "0.8.5" rand = "0.8.5"
rayon = "1.7.0" rayon = "1.7.0"
regex = "1.7.1" regex = "1.7.1"
rust-ini = "0.18.0" rust-ini = "0.18.0"
semver = "1.0.16" semver = "1.0.17"
serde = { version = "1.0.152", features = ["derive"] } serde = { version = "1.0.158", features = ["derive"] }
serde_json = "1.0.94" serde_json = "1.0.94"
sha1 = "0.10.5" sha1 = "0.10.5"
shadow-rs = { version = "0.21.0", default-features = false } shadow-rs = { version = "0.21.0", default-features = false }
@ -80,8 +80,8 @@ starship-battery = { version = "0.7.9", optional = true }
strsim = "0.10.0" strsim = "0.10.0"
systemstat = "=0.2.3" systemstat = "=0.2.3"
terminal_size = "0.2.5" terminal_size = "0.2.5"
toml = { version = "0.7.2", features = ["preserve_order"] } toml = { version = "0.7.3", features = ["preserve_order"] }
toml_edit = "0.19.4" toml_edit = "0.19.7"
unicode-segmentation = "1.10.1" unicode-segmentation = "1.10.1"
unicode-width = "0.1.10" unicode-width = "0.1.10"
urlencoding = "2.1.2" urlencoding = "2.1.2"
@ -104,7 +104,7 @@ features = ["preserve_order", "indexmap"]
deelevate = "0.2.0" deelevate = "0.2.0"
[target.'cfg(windows)'.dependencies.windows] [target.'cfg(windows)'.dependencies.windows]
version = "0.44.0" version = "0.46.0"
features = [ features = [
"Win32_Foundation", "Win32_Foundation",
"Win32_UI_Shell", "Win32_UI_Shell",

1
README.md
View File

@ -424,7 +424,6 @@ Support this project by [becoming a sponsor](https://github.com/sponsors/starshi
**Supporter Tier** **Supporter Tier**
- [Dimension](https://dimension.dev/)
- [Appwrite](https://appwrite.io/) - [Appwrite](https://appwrite.io/)
<p align="center"> <p align="center">

3
docs/.vuepress/public/presets/toml/nerd-font-symbols.toml
View File

@ -46,6 +46,9 @@ symbol = "⌘ "
[hg_branch] [hg_branch]
symbol = " " symbol = " "
[hostname]
ssh_symbol = " "
[java] [java]
symbol = " " symbol = " "

3
docs/.vuepress/public/presets/toml/no-runtime-versions.toml
View File

@ -49,6 +49,9 @@ format = 'via [$symbol]($style)'
[helm] [helm]
format = 'via [$symbol]($style)' format = 'via [$symbol]($style)'
[java]
format = 'via [$symbol]($style)'
[julia] [julia]
format = 'via [$symbol]($style)' format = 'via [$symbol]($style)'

2
docs/config/README.md
View File

@ -745,7 +745,7 @@ error_symbol = '[➜](bold red) '
# ~/.config/starship.toml # ~/.config/starship.toml
[character] [character]
vicmd_symbol = '[V](bold green) ' vimcmd_symbol = '[V](bold green) '
``` ```
## CMake ## CMake

28
install/macos_packages/build_and_notarize.sh
View File

@ -2,30 +2,30 @@
set -euo pipefail set -euo pipefail
# Envrionmental variables that need to be set. These are sane defaults # Environmental variables that need to be set. These are sane defaults
# KEYCHAIN_ENTRY=AC_PASSWORD # Or whatever you picked for <AUTH_ITEM_NAME> # KEYCHAIN_ENTRY=AC_PASSWORD # Or whatever you picked for <AUTH_ITEM_NAME>
# RUNNER_TEMP=~/Library/Keychains/ # RUNNER_TEMP=~/Library/Keychains/
# KEYCHAIN_FILENAME=login.keychain-db # KEYCHAIN_FILENAME=login.keychain-db
# #
# Environmental variables that can be set if needed. Else they will default to # Environmental variables that can be set if needed. Else they will default to
# values selected for the CI # values selected for the CI
# #
# The identifier for the application signing key. Can be a name or a fingerprint # The identifier for the application signing key. Can be a name or a fingerprint
# APPLICATION_KEY_IDENT=E03290CABE09E9E42341C8FC82608E91241FAD4A # APPLICATION_KEY_IDENT=E03290CABE09E9E42341C8FC82608E91241FAD4A
# The identifier for the installer signing key. Can be a name or a fingerprint # The identifier for the installer signing key. Can be a name or a fingerprint
# INSTALLATION_KEY_IDENT=E525359D0B5AE97B7B6F5BB465FEC872C117D681 # INSTALLATION_KEY_IDENT=E525359D0B5AE97B7B6F5BB465FEC872C117D681
usage(){ usage() {
echo "Builds, signs, and notarizes starship." echo "Builds, signs, and notarizes starship."
echo "Read readme.md in the script directory to see the assumptions the script makes." echo "Read readme.md in the script directory to see the assumptions the script makes."
echo "Usage: $0 <path-to-starship-binary> <path-to-docs-directory> <arch> [pkgname]" echo "Usage: $0 <path-to-starship-binary> <path-to-docs-directory> <arch> [pkgname]"
echo " Example: $0 target/release/starship docs/ x64" echo " Example: $0 target/release/starship docs/ x64"
echo " Example: $0 target/debug/starship docs/ arm64 starship-1.2.1-arm64.pkg" echo " Example: $0 target/debug/starship docs/ arm64 starship-1.2.1-arm64.pkg"
echo "" echo ""
echo "If no pkgname is provided, the package will be named starship-<version>-<arch>.pkg" echo "If no pkgname is provided, the package will be named starship-<version>-<arch>.pkg"
} }
script_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
source "$script_dir/common.sh" source "$script_dir/common.sh"
if [[ -z ${KEYCHAIN_ENTRY+x} ]]; then if [[ -z ${KEYCHAIN_ENTRY+x} ]]; then
@ -56,8 +56,8 @@ if [[ -z ${INSTALLATION_KEY_IDENT+x} ]]; then
fi fi
if [[ -z ${3+x} ]]; then if [[ -z ${3+x} ]]; then
usage usage
exit 1 exit 1
fi fi
starship_binary="$1" starship_binary="$1"
@ -112,4 +112,4 @@ if [ "$pkgname" = "" ]; then
fi fi
echo ">>>> Placing final output at $pkgname" echo ">>>> Placing final output at $pkgname"
mv starship.pkg "$pkgname" mv starship.pkg "$pkgname"

10
install/macos_packages/build_component_package.sh
View File

@ -8,7 +8,7 @@ set -euo pipefail
# Usage: run this script, passing $1 to the repository path. The script assumes # Usage: run this script, passing $1 to the repository path. The script assumes
# it is being run from within a starship repository if $1 is not provided. # it is being run from within a starship repository if $1 is not provided.
usage(){ usage() {
echo "Builds a component package for macOS." echo "Builds a component package for macOS."
echo "Assumes that the following items already exist:" echo "Assumes that the following items already exist:"
echo " - A starship binary which has already been notarized" echo " - A starship binary which has already been notarized"
@ -17,10 +17,10 @@ usage(){
echo "Usage: $0 <path-to-starship-binary> <path-to-dist-directory>" echo "Usage: $0 <path-to-starship-binary> <path-to-dist-directory>"
} }
script_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
source "$script_dir/common.sh" source "$script_dir/common.sh"
cleanup_server(){ cleanup_server() {
if [[ -n "${server_pid-}" ]]; then if [[ -n "${server_pid-}" ]]; then
echo "Killing HTTP server ($server_pid) to clean up." echo "Killing HTTP server ($server_pid) to clean up."
kill "$server_pid" kill "$server_pid"
@ -77,7 +77,7 @@ sleep 3
# on MacOS by default, but lucky for us, it does exist on GHActions runners. # on MacOS by default, but lucky for us, it does exist on GHActions runners.
# Wget may return nonzero exit codes even if things were mostly fine (e.g. 404 for # Wget may return nonzero exit codes even if things were mostly fine (e.g. 404 for
# some links on translated pages) so we simply ignore if it has a failure # some links on translated pages) so we simply ignore if it has a failure
wget --mirror --convert-links --adjust-extension --page-requisites --no-parent 127.0.0.1:8000 &> wget.log || true wget --mirror --convert-links --adjust-extension --page-requisites --no-parent 127.0.0.1:8000 &>wget.log || true
mkdir -p "$pkgdir/usr/local/share/doc/" mkdir -p "$pkgdir/usr/local/share/doc/"
mv 127.0.0.1:8000 "$pkgdir/usr/local/share/doc/starship" mv 127.0.0.1:8000 "$pkgdir/usr/local/share/doc/starship"
@ -87,4 +87,4 @@ trap - INT
# Build the component package # Build the component package
version="$(starship_version "$starship_program_file")" version="$(starship_version "$starship_program_file")"
pkgbuild --identifier com.starshipprompt.starship --version "$version" --root $pkgdir starship-component.pkg pkgbuild --identifier com.starshipprompt.starship --version "$version" --root $pkgdir starship-component.pkg

31
install/macos_packages/build_distribution_package.sh
View File

@ -4,25 +4,25 @@ component_package="$1"
resources="$2" resources="$2"
arch="$3" arch="$3"
usage(){ usage() {
echo "Builds a distribution package for macOS." echo "Builds a distribution package for macOS."
echo "Assumes that the following items already exist:" echo "Assumes that the following items already exist:"
echo " - A starship component package" echo " - A starship component package"
echo " - Resources in a pkg_resources directory" echo " - Resources in a pkg_resources directory"
echo "Usage: $0 <path-to-component-package> <path-to-pkg-resources> <arch>" echo "Usage: $0 <path-to-component-package> <path-to-pkg-resources> <arch>"
echo " where arch is one of \"arm64\" or \"x86_64\"" echo " where arch is one of \"arm64\" or \"x86_64\""
} }
script_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
source "$script_dir/common.sh" source "$script_dir/common.sh"
if [[ "$OSTYPE" != 'darwin'* ]]; then if [[ "$OSTYPE" != 'darwin'* ]]; then
error "This script only works on MacOS" error "This script only works on MacOS"
fi fi
if [[ "${3-undefined}" = "undefined" ]]; then if [[ "${3-undefined}" = "undefined" ]]; then
usage usage
exit 1 exit 1
fi fi
# Generate a distribution file with the appropriate architecture plists # Generate a distribution file with the appropriate architecture plists
@ -40,8 +40,7 @@ productbuild --synthesize --package starship-component.pkg --product "$archplist
# search for a line that matches our opening tag and insert our desired lines after it # search for a line that matches our opening tag and insert our desired lines after it
# Solution taken from https://www.theunixschool.com/2012/06/insert-line-before-or-after-pattern.html # Solution taken from https://www.theunixschool.com/2012/06/insert-line-before-or-after-pattern.html
while read -r line while read -r line; do
do
echo "$line" echo "$line"
if echo "$line" | grep -qF '<installer-gui-script '; then if echo "$line" | grep -qF '<installer-gui-script '; then
echo '<welcome file="welcome.html" mime-type="text-html" />' echo '<welcome file="welcome.html" mime-type="text-html" />'
@ -49,10 +48,10 @@ do
echo '<conclusion file="conclusion.html" mime-type="text-html" />' echo '<conclusion file="conclusion.html" mime-type="text-html" />'
echo '<background file="icon.png" scaling="proportional" alignment="bottomleft"/>' echo '<background file="icon.png" scaling="proportional" alignment="bottomleft"/>'
fi fi
done < starship_raw.dist > starship.dist done <starship_raw.dist >starship.dist
# The above script does not correctly take care of the last line. Apply fixup. # The above script does not correctly take care of the last line. Apply fixup.
echo '</installer-gui-script>' >> starship.dist echo '</installer-gui-script>' >>starship.dist
echo "Creating distribution package with following distribution file:" echo "Creating distribution package with following distribution file:"
cat starship.dist cat starship.dist
@ -64,4 +63,4 @@ echo "Component package is $component_package"
productbuild --distribution starship.dist --resources "$resources" --package-path "$component_package" starship-unsigned.pkg productbuild --distribution starship.dist --resources "$resources" --package-path "$component_package" starship-unsigned.pkg
# Clean up the distribution files # Clean up the distribution files
rm -- *.dist rm -- *.dist

10
install/macos_packages/common.sh
View File

@ -1,17 +1,17 @@
#!/bin/bash #!/bin/bash
error(){ error() {
echo "[ERROR]: $1" echo "[ERROR]: $1"
exit 1 exit 1
} }
starship_version(){ starship_version() {
starship_program_file="$1" starship_program_file="$1"
# Check if this is a relative path: if so, prepend './' to it # Check if this is a relative path: if so, prepend './' to it
if [ "$1" = "${1#/}" ]; then if [ "$1" = "${1#/}" ]; then
starship_program_file="./$starship_program_file" starship_program_file="./$starship_program_file"
fi fi
if "$starship_program_file" -V 2>&1 > /dev/null; then if "$starship_program_file" -V 2>&1 >/dev/null; then
"$starship_program_file" -V | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+' "$starship_program_file" -V | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+'
else else
# try to get this information from Cargo.toml # try to get this information from Cargo.toml

2
install/macos_packages/readme.md
View File

@ -138,7 +138,7 @@ attempts, run
xcrun notarytool history --keychain-profile "AC_PASSWORD" xcrun notarytool history --keychain-profile "AC_PASSWORD"
``` ```
Find the `id` of the attempt you wish to view, then run one of these commmands: Find the `id` of the attempt you wish to view, then run one of these commands:
``` ```
xcrun notarytool info <run-id> --keychain-profile "AC_PASSWORD" xcrun notarytool info <run-id> --keychain-profile "AC_PASSWORD"

2
src/init/mod.rs
View File

@ -169,7 +169,7 @@ pub fn init_stub(shell_name: &str) -> io::Result<()> {
"ion" => print!("eval $({} init ion --print-full-init)", starship.sprint()?), "ion" => print!("eval $({} init ion --print-full-init)", starship.sprint()?),
"elvish" => print!( "elvish" => print!(
r#"eval ({} init elvish --print-full-init | slurp)"#, r#"eval ({} init elvish --print-full-init | slurp)"#,
starship.sprint_posix()? starship.sprint()?
), ),
"tcsh" => print!( "tcsh" => print!(
r#"eval `({} init tcsh --print-full-init)`"#, r#"eval `({} init tcsh --print-full-init)`"#,

8
src/modules/fossil_branch.rs
View File

@ -17,9 +17,15 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
return None; return None;
}; };
let checkout_db = if cfg!(windows) {
"_FOSSIL_"
} else {
".fslckout"
};
let is_checkout = context let is_checkout = context
.try_begin_scan()? .try_begin_scan()?
.set_files(&[".fslckout"]) .set_files(&[checkout_db])
.is_match(); .is_match();
if !is_checkout { if !is_checkout {

2
src/modules/nim.rs
View File

@ -64,7 +64,7 @@ fn parse_nim_version(version_cmd_output: &str) -> Option<&str> {
// First line has the version // First line has the version
.next()? .next()?
.split(' ') .split(' ')
.find(|&s| s.chars().all(|c| ('0'..='9').contains(&c) || c == '.')) .find(|&s| s.chars().all(|c| c.is_ascii_digit() || c == '.'))
} }
#[cfg(test)] #[cfg(test)]

7
src/test/mod.rs
View File

@ -176,11 +176,16 @@ pub enum FixtureProvider {
pub fn fixture_repo(provider: FixtureProvider) -> io::Result<TempDir> { pub fn fixture_repo(provider: FixtureProvider) -> io::Result<TempDir> {
match provider { match provider {
FixtureProvider::Fossil => { FixtureProvider::Fossil => {
let checkout_db = if cfg!(windows) {
"_FOSSIL_"
} else {
".fslckout"
};
let path = tempfile::tempdir()?; let path = tempfile::tempdir()?;
fs::OpenOptions::new() fs::OpenOptions::new()
.create(true) .create(true)
.write(true) .write(true)
.open(path.path().join(".fslckout"))? .open(path.path().join(checkout_db))?
.sync_all()?; .sync_all()?;
Ok(path) Ok(path)
} }