Skip to content

Commit 59fd3a0

Browse files
Shaun Princejrtc27chewblackaMVSeasyaspi314
committed
fix: Cherry-pick bug fixes from upstream PRs (page 2)
Cherry-picked fixes from dylanaraps/neofetch open PRs: - PR dylanaraps#2014: Fix FreeBSD pkg hang when not bootstrapped (add </dev/null) - PR dylanaraps#2006: Case-insensitive AppImage file matching - PR dylanaraps#2017: Add font size to Apple Terminal output - PR dylanaraps#1923: Add Termux terminal detection via TERMUX_VERSION - PR dylanaraps#1876: Add cargo package manager detection - PR dylanaraps#2073: Fix man page typo (extra space) - PR dylanaraps#2051: Fix comment typo (Color -> Column Alignment) Co-Authored-By: jrtc27 <jrtc27@jrtc27.com> Co-Authored-By: chewblacka <chewblacka@users.noreply.github.com> Co-Authored-By: MVS <MVS@users.noreply.github.com> Co-Authored-By: easyaspi314 <easyaspi314@users.noreply.github.com> Co-Authored-By: DessertEagle <DessertEagle@users.noreply.github.com> Co-Authored-By: superatomic <superatomic@users.noreply.github.com> Co-Authored-By: thehefi <thehefi@users.noreply.github.com>
1 parent 50e9a58 commit 59fd3a0

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

neofetch

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ block_width=3
659659
# Flag: --block_height
660660
block_height=1
661661
662-
# Color Alignment
662+
# Column Alignment
663663
#
664664
# Default: 'auto'
665665
# Values: 'auto', 'num'
@@ -1584,7 +1584,7 @@ get_packages() {
15841584
has pkginfo && tot pkginfo -i
15851585

15861586
case $kernel_name in
1587-
FreeBSD|DragonFly) has pkg && tot pkg info ;;
1587+
FreeBSD|DragonFly) has pkg && tot pkg info </dev/null ;;
15881588

15891589
*)
15901590
has pkg && dir /var/db/pkg/*
@@ -1598,14 +1598,15 @@ get_packages() {
15981598
has flatpak && tot flatpak list
15991599
has spm && tot spm list -i
16001600
has puyo && dir ~/.puyo/installed
1601+
has cargo && dir ~/.cargo/bin/*
16011602

16021603
# Snap hangs if the command is run without the daemon running.
16031604
# Only run snap if the daemon is also running.
16041605
has snap && ps -e | grep -qFm 1 snapd >/dev/null && tot snap list && ((packages-=1))
16051606

16061607
# This is the only standard location for appimages.
16071608
# See: https://github.com/AppImage/AppImageKit/wiki
1608-
manager=appimage && has appimaged && dir ~/.local/bin/*.appimage
1609+
manager=appimage && has appimaged && dir ~/.local/bin/*.[Aa]pp[Ii]mage
16091610
;;
16101611

16111612
"Mac OS X"|"macOS"|MINIX)
@@ -3266,6 +3267,10 @@ get_term() {
32663267
esac
32673268
done
32683269

3270+
# Termux sets TERMUX_VERSION. Put this after the PPID check because this is
3271+
# also set if using a terminal on an X server.
3272+
[[ -z "$term" && "$TERMUX_VERSION" ]] && term="Termux ${TERMUX_VERSION}"
3273+
32693274
# Log that the function was run.
32703275
term_run=1
32713276
}
@@ -3289,7 +3294,8 @@ get_term_font() {
32893294

32903295
"Apple_Terminal")
32913296
term_font="$(osascript <<END
3292-
tell application "Terminal" to font name of window frontmost
3297+
tell application "Terminal" to font name of window frontmost \
3298+
& " " & font size of window frontmost
32933299
END
32943300
)"
32953301
;;
@@ -4854,7 +4860,7 @@ INFO:
48544860
NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu'
48554861
48564862
--title_fqdn on/off Hide/Show Fully Qualified Domain Name in title.
4857-
--package_managers on/off Hide/Show Package Manager names . (on, tiny, off)
4863+
--package_managers on/off Hide/Show Package Manager names. (on, tiny, off)
48584864
--os_arch on/off Hide/Show OS architecture.
48594865
--speed_type type Change the type of cpu speed to display.
48604866
Possible values: current, min, max, bios,

0 commit comments

Comments
 (0)