Skip to content

Commit

Permalink
fix(uptime): filter out singular "user" string in sed expression (#255)
Browse files Browse the repository at this point in the history
Previously, on machines where the logged-in user count is 1, the `sed`
expression to filter out "... X users, ..." doesn't filter out "... X
user, ...", leading to something like

```
1h 05,  1 user,  load average: 0.05, 0.72, 1.62m
```

being displayed in the module. When the user count is greater than 1
(e.g., after `ssh localhost`), the `uptime` module displays

```
1h 05m
```

as expected.

The Stack Overflow answer the `sed` expression is based on [^1][^2]
doesn't seem to consider the case when the user count is 1.

With this patch, the `uptime` module display correctly when the user
count is 1.

[^1]: https://stackoverflow.com/a/28353785
[^2]: #163
  • Loading branch information
bryan-hoang authored Jul 19, 2024
1 parent 0044678 commit 408c02c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion status/uptime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ show_uptime() {
index=$1
icon="$(get_tmux_option "@catppuccin_uptime_icon" "󰔟")"
color="$(get_tmux_option "@catppuccin_uptime_color" "$thm_green")"
text="$(get_tmux_option "@catppuccin_uptime_text" "#(uptime | sed 's/^[^,]*up *//; s/, *[[:digit:]]* users.*//; s/ day.*, */d /; s/:/h /; s/ min//; s/$/m/')")"
text="$(get_tmux_option "@catppuccin_uptime_text" "#(uptime | sed 's/^[^,]*up *//; s/, *[[:digit:]]* user.*//; s/ day.*, */d /; s/:/h /; s/ min//; s/$/m/')")"

module=$(build_status_module "$index" "$icon" "$color" "$text")

Expand Down

0 comments on commit 408c02c

Please sign in to comment.