Skip to content

Commit

Permalink
Merge branch 'main' into fix/size-coloring-tweaks-without-color-scale
Browse files Browse the repository at this point in the history
  • Loading branch information
PThorpe92 authored May 22, 2024
2 parents a47b660 + 22dbeec commit bc5d9b4
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 28 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/flake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Check Nix flake inputs
uses: DeterminateSystems/flake-checker-action@v5
uses: DeterminateSystems/flake-checker-action@v7

check:
name: Check Nix Flake
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@v10
uses: DeterminateSystems/nix-installer-action@v11
- name: Setup Nix cache
uses: DeterminateSystems/magic-nix-cache-action@main
- name: Nix Flake Check
Expand All @@ -57,7 +57,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@v10
uses: DeterminateSystems/nix-installer-action@v11
- name: Setup Nix cache
uses: DeterminateSystems/magic-nix-cache-action@main
- name: Nix Build
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Changelog

## [0.18.16] - 2024-05-16

### Bug Fixes

- Change windows-only imports to be windows-only

### Documentation

- Replace decay with color-scale
- Update INSTALL.md
- Fix typo in `INSTALL.md`
- Use 3 columns for packaging status badge

### Build

- Bump DeterminateSystems/flake-checker-action from 5 to 7
- Bump DeterminateSystems/nix-installer-action from 10 to 11

## [0.18.15] - 2024-05-09

### Bug Fixes
Expand All @@ -18,6 +36,10 @@
- Return to original commit at the end of deb-package.sh
- Add optional tag argument to deb-package.sh

### Miscellaneous Tasks

- Release eza v0.18.15

## [0.18.14] - 2024-05-02

### Features
Expand Down
50 changes: 31 additions & 19 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ readme = "README.md"
homepage = "https://github.com/eza-community/eza"
license = "MIT"
repository = "https://github.com/eza-community/eza"
version = "0.18.15"
version = "0.18.16"


[package.metadata.deb]
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ sudo chown root:root eza
sudo mv eza /usr/local/bin/eza
```

If `exa` was install before, replace it will `eza`:
If `exa` was installed before, replace it with `eza`:
```shell
sudo rm -f /usr/local/bin/exa
sudo ln -s /usr/local/bin/eza /usr/local/bin/exa
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ If you want to pass arguments this way, use e.g. `nix run github:eza-community/e
eza is available for Windows, macOS and Linux. Platform and distribution
specific installation instructions can be found in [INSTALL.md](INSTALL.md).

[![Packaging status](https://repology.org/badge/vertical-allrepos/eza.svg)](https://repology.org/project/eza/versions)
[![Packaging status](https://repology.org/badge/vertical-allrepos/eza.svg?columns=3)](https://repology.org/project/eza/versions)

---

Expand Down
2 changes: 1 addition & 1 deletion man/eza.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ For more information on the format of these environment variables, see the [eza_
Overrides any `--git` or `--git-repos` argument

## `EZA_MIN_LUMINANCE`
Specifies the minimum luminance to use when decay is active. It's value can be between -100 to 100.
Specifies the minimum luminance to use when color-scale is active. It's value can be between -100 to 100.

## `EZA_ICONS_AUTO`

Expand Down
3 changes: 1 addition & 2 deletions src/output/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#[cfg_attr(target_os = "netbsd", allow(unused_imports))]
#[cfg_attr(target_os = "freebsd", allow(unused_imports))]
#[cfg(target_os = "windows")]
pub use self::cell::{DisplayWidth, TextCell, TextCellContents};
pub use self::escape::escape;

Expand Down

0 comments on commit bc5d9b4

Please sign in to comment.