Przeglądaj źródła

Merge branch 'main' into style_docs

Christina Sørensen 2 lat temu
rodzic
commit
7e153dcc9b
4 zmienionych plików z 27 dodań i 10 usunięć
  1. 1 1
      .github/workflows/unit-tests.yml
  2. 19 9
      README.md
  3. 1 0
      flake.nix
  4. 6 0
      man/eza_colors.5.md

+ 1 - 1
.github/workflows/unit-tests.yml

@@ -43,7 +43,7 @@ jobs:
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 5
-          max_attemps: 5
+          max_attempts: 5
           command: cargo install cargo-hack
 
       - name: Run unit tests

+ 19 - 9
README.md

@@ -99,24 +99,24 @@ pacman -S eza
 Eza is available from [deb.gierens.de](http://deb.gierens.de). The GPG public
 key is in this repo under [deb.asc](/deb.asc).
 
-To install eza from this repo use:
+First make sure you have the `gpg` command, and otherwise install it via:
 
 ```bash
-wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | sudo tee /etc/apt/trusted.gpg.d/gierens.asc
-echo "deb http://deb.gierens.de stable main" | sudo tee /etc/apt/sources.list.d/gierens.list
 sudo apt update
-sudo apt install -y eza
+sudo apt install -y gpg
 ```
 
-**Note:** on some systems like Docker containers apt might require the key
-to be in dearmored format, then use this command instead:
+Then install eza via:
 
 ```bash
-wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/gierens.asc
+sudo mkdir -p /etc/apt/keyrings
+wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | sudo gpg --dearmor -o /etc/apt/keyrings/gierens.gpg
+echo "deb [signed-by=/etc/apt/keyrings/gierens.gpg] http://deb.gierens.de stable main" | sudo tee /etc/apt/sources.list.d/gierens.list
+sudo chmod 644 /etc/apt/keyrings/gierens.gpg /etc/apt/sources.list.d/gierens.list
+sudo apt update
+sudo apt install -y eza
 ```
 
-before proceeding with the others from above.
-
 ### Nix (Linux, MacOS)
 
 [![nixpkgs unstable package](https://repology.org/badge/version-for-repo/nix_unstable/eza.svg)](https://repology.org/project/eza/versions)
@@ -162,6 +162,16 @@ Fedora support is in the works.
 
 https://bugzilla.redhat.com/show_bug.cgi?id=2238264
 
+### Void Linux
+
+[![Void Linux package](https://repology.org/badge/version-for-repo/void_x86_64/eza.svg)](https://repology.org/project/eza/versions)
+
+Eza is available as the [eza](https://github.com/void-linux/void-packages/tree/master/srcpkgs/eza) package in the official Void Linux repository.
+
+```bash
+sudo xbps-install eza
+```
+
 ### Brew (MacOS)
 
 [![Homebrew package](https://repology.org/badge/version-for-repo/homebrew/eza.svg)](https://repology.org/project/eza/versions)

+ 1 - 0
flake.nix

@@ -153,6 +153,7 @@
         checks = {
           formatting = treefmtEval.config.build.check self;
           build = packages.check;
+          default = packages.default;
           test = packages.test;
           lint = packages.clippy;
           trycmd = packages.trycmd;

+ 6 - 0
man/eza_colors.5.md

@@ -266,6 +266,12 @@ The codes accepted by eza are:
 `1`
 : for bold
 
+`2`
+: for dimmed
+
+`3`
+: for italic
+
 `4`
 : for underline