Skip to content

Commit c4841c7

Browse files
authored
Merge branch 'master' into recent-date-format
2 parents 894e2c3 + 7b18d52 commit c4841c7

File tree

5 files changed

+226
-54
lines changed

5 files changed

+226
-54
lines changed

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
name: Bug Report Form
2+
description: Create a report to help us improve, by the new GitHub form
3+
title: "[Bug]: "
4+
labels: ["bug"]
5+
assignees:
6+
- zwpaper
7+
body:
8+
- type: markdown
9+
attributes:
10+
value: |
11+
Thanks for taking the time to fill out this bug report!
12+
- type: checkboxes
13+
id: latest-version
14+
attributes:
15+
label: Version
16+
description: Please make sure you can reproduce in the [latest release](https://github.com/lsd-rs/lsd/releases/latest)
17+
options:
18+
- label: latest
19+
required: true
20+
- type: textarea
21+
id: version
22+
attributes:
23+
label: version
24+
description: "`lsd --version` output"
25+
placeholder: lsd --version
26+
validations:
27+
required: true
28+
- type: dropdown
29+
id: os
30+
attributes:
31+
label: What OS are you seeing the problem on?
32+
multiple: true
33+
options:
34+
- Windows
35+
- Linux
36+
- macOS
37+
- Others
38+
- type: textarea
39+
id: installation
40+
attributes:
41+
label: installation
42+
description: "how do you install lsd?"
43+
placeholder: "how do you install lsd?"
44+
validations:
45+
required: true
46+
- type: textarea
47+
id: term
48+
attributes:
49+
label: term
50+
description: "`echo $TERM` output"
51+
placeholder: echo $TERM
52+
validations:
53+
required: false
54+
- type: textarea
55+
id: ls-colors
56+
attributes:
57+
label: ls-colors
58+
description: "`echo $LS_COLORS` output"
59+
placeholder: echo $LS_COLORS
60+
validations:
61+
required: false
62+
- type: textarea
63+
id: what-happened
64+
attributes:
65+
label: What happened?
66+
description: Tell us what happen?
67+
placeholder: |
68+
If applicable, add the output of the classic ls command (`\ls -la`) in order to show the buggy file/directory.
69+
render: markdown
70+
validations:
71+
required: true
72+
- type: textarea
73+
id: what-expected
74+
attributes:
75+
label: What expected?
76+
description: What did you expect to happen?
77+
placeholder: |
78+
If the application panics run the command with the trace (`RUST_BACKTRACE=1 lsd ...`).
79+
In case of graphical errors, add a screenshot if possible."
80+
render: markdown
81+
validations:
82+
required: true
83+
- type: textarea
84+
id: others
85+
attributes:
86+
label: What else?
87+
description: Is there anything else you want to tell us?
88+
placeholder: "Others"
89+
render: markdown
90+
validations:
91+
required: false

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313
on other platform the same as `--all` [#752](https://github.com/Peltoche/lsd/issues/752)
1414
- Add many icons from https://github.com/Peltoche/lsd/issues/764 [@TruncatedDinosour](https://ari-web.xyz/gh)
1515
- Add support for localization from [scarf](https://github.com/scarf005)
16+
- Add icons for cjs, cts and mts from [Han Yeong-woo](https://github.com/nix6839)
17+
- Fix obsolete Nerd Font icons from [Han Yeong-woo](https://github.com/nix6839)
1618
- Add support to format dates for recent files differently. If `'+<date_format>'` contains a second format it is applied to files from the last six months. The formats are separated by new-line, similar to `TIME_STYLE` in GNU ls.
1719

1820
### Fixed
@@ -24,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2426
[`LS_COLORS`](README.md#Colors) can be used to customize.
2527
- Handle dereference (-L) with broken symlink from [r3dArch](https://github.com/r3dArch)
2628
- Avoid using Clap's deprecated structs and functions [sudame](https://github.com/sudame)
29+
- Icon theme with overrides from config [sudame](https://github.com/sudame)
2730

2831
## [0.23.1] - 2022-09-13
2932

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,12 +338,12 @@ filetype:
338338
dir: 📂
339339
file: 📄
340340
pipe: 📩
341-
socket:
341+
socket: 󰆨
342342
executable: 
343343
symlink-dir: 
344344
symlink-file: 
345345
device-char: 
346-
device-block:
346+
device-block: 󰜫
347347
special: 
348348
```
349349

@@ -431,6 +431,12 @@ lsd --icon never --ignore-config
431431

432432
`lsd` will try to display the UTF-8 chars in file name, A `U+FFFD REPLACEMENT CHARACTER`(�) is used to represent the invalid UTF-8 chars.
433433

434+
### Icons are showing up strangely
435+
436+
Nerd Fonts is moving the codepoints of the Material Design Icons in 3.0, so lsd has updated the icons in #830. If your icons look weird, use fonts that have been patched using Nerd Fonts v2.3.0 or later.
437+
438+
See also: <https://github.com/ryanoasis/nerd-fonts/releases/tag/v2.3.3>
439+
434440
## Contributors
435441

436442
Everyone can contribute to this project, improving the code or adding functions. If anyone wants something to be added we will try to do it.

src/meta/name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ mod test {
376376
let name = Name::new(&pipe_path, file_type);
377377

378378
assert_eq!(
379-
" pipe.tmp".to_string().with(Color::AnsiValue(184)),
379+
"󰈲 pipe.tmp".to_string().with(Color::AnsiValue(184)),
380380
name.render(
381381
&colors,
382382
icons,

0 commit comments

Comments
 (0)