kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix disk usage and user

Browse source
This commit is contained in:
Dylan Araps 2016-08-26 12:07:26 +10:00
parent d41d805f1a
commit 8250f5052a
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
neofetch
View file

@ -129,7 +129,7 @@ getdistro() {
# Title {{{ # Title {{{
gettitle() { gettitle() {
title="${USER:-$(whoami)}@${HOSTNAME:-$(hostname)}" title="${USER:-$(whoami || printf "%s" "${HOME/*\/}")}@${HOSTNAME:-$(hostname)}"
} }
# }}} # }}}
@ -1468,7 +1468,15 @@ gettermfont() {
getdisk() { getdisk() {
# df flags # df flags
case "$os" in case "$os" in
"Linux" | "iPhone OS" | "Windows" | "Solaris") df_flags="-h -l --total" ;; "Linux" | "iPhone OS" | "Windows" | "Solaris")
df_flags="-h -l --total"
df_dir="total"
case "$distro" in
"OpenWRT"*) df_flags="-h"; df_dir="rootfs" ;;
esac
;;
"Mac OS X" | "BSD") "Mac OS X" | "BSD")
case "$distro" in case "$distro" in
"FreeBSD"* | *"OS X"* ) df_flags="-H / -l" ;; "FreeBSD"* | *"OS X"* ) df_flags="-H / -l" ;;
@ -1478,7 +1486,8 @@ getdisk() {
esac esac
# Get the disk info # Get the disk info
disk="$(df $df_flags 2>/dev/null | awk 'END{print $2 ":" $3 ":" $5}')" disk="$(df $df_flags 2>/dev/null | awk -v dir="$df_dir" '$0 ~ dir {print $2 ":" $3 ":" $5}')"
# Format the output # Format the output
disk_used="${disk#*:}" disk_used="${disk#*:}"