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

misc: cleanup

Browse source
This commit is contained in:
Dylan Araps 2018-06-04 06:51:30 +10:00
parent c461704b36
commit 23d02ae90e
1 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
neofetch
View file

@ -971,7 +971,7 @@ get_distro() {
"Solaris") "Solaris")
case "$distro_shorthand" in case "$distro_shorthand" in
"on" | "tiny") distro="$(awk 'NR==1{print $1 " " $3;}' /etc/release)" ;; "on" | "tiny") distro="$(awk 'NR==1{print $1 " " $3;}' /etc/release)" ;;
*) distro="$(awk 'NR==1{print $1 " " $2 " " $3;}' /etc/release)" ;; *) distro="$(awk 'NR==1{print $1 " " $2 " " $3;}' /etc/release)" ;;
esac esac
distro="${distro/\(*}" distro="${distro/\(*}"
;; ;;
@ -1430,11 +1430,15 @@ get_de() {
# Format strings. # Format strings.
case "$de" in case "$de" in
"KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;;
*"MUFFIN"* | "Cinnamon") de="$(cinnamon --version)"; de="${de:-Cinnamon}" ;;
*"xfce4"*) de="Xfce4" ;; *"xfce4"*) de="Xfce4" ;;
*"xfce5"*) de="Xfce5" ;; *"xfce5"*) de="Xfce5" ;;
*"xfce"*) de="Xfce" ;; *"xfce"*) de="Xfce" ;;
*"mate"*) de="MATE" ;; *"mate"*) de="MATE" ;;
*"MUFFIN"* | "Cinnamon")
de="$(cinnamon --version)"; de="${de:-Cinnamon}"
;;
*"GNOME"*) *"GNOME"*)
de="$(gnome-shell --version)" de="$(gnome-shell --version)"
de="${de/Shell }" de="${de/Shell }"
@ -1503,11 +1507,11 @@ get_wm() {
ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm')" ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm')"
case "$ps_line" in case "$ps_line" in
*"chunkwm"*) wm="chunkwm" ;; *"chunkwm"*) wm="chunkwm" ;;
*"kwm"*) wm="Kwm" ;; *"kwm"*) wm="Kwm" ;;
*"Amethyst"*) wm="Amethyst" ;; *"Amethyst"*) wm="Amethyst" ;;
*"Spectacle"*) wm="Spectacle" ;; *"Spectacle"*) wm="Spectacle" ;;
*) wm="Quartz Compositor" ;; *) wm="Quartz Compositor" ;;
esac esac
;; ;;
@ -1524,15 +1528,14 @@ get_wm() {
;; ;;
"FreeMiNT") "FreeMiNT")
wm="Atari AES" freemint_wm=(/proc/*)
for files in /proc/*; do case "${freemint_wm[*]}" in
case "$files" in *xaaes*) wm="XaAES" ;;
*xaaes*) wm="XaAES" ;; *myaes*) wm="MyAES" ;;
*myaes*) wm="MyAES" ;; *naes*) wm="N.AES" ;;
*naes*) wm="N.AES" ;; geneva) wm="Geneva" ;;
geneva) wm="Geneva" ;; *) wm="Atari AES" ;;
esac esac
done
;; ;;
esac esac
fi fi
@ -1773,7 +1776,7 @@ get_cpu() {
# Get CPU cores. # Get CPU cores.
case "$cpu_cores" in case "$cpu_cores" in
"logical" | "on") cores="$(sysctl -n hw.logicalcpu_max)" ;; "logical" | "on") cores="$(sysctl -n hw.logicalcpu_max)" ;;
"physical") cores="$(sysctl -n hw.physicalcpu_max)" ;; "physical") cores="$(sysctl -n hw.physicalcpu_max)" ;;
esac esac
;; ;;
@ -1876,7 +1879,9 @@ get_cpu() {
cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')"
;; ;;
"physical") cores="$(lparstat -i | awk -F':' '/Active Physical CPUs/ {printf $2}')" "physical")
cores="$(lparstat -i | awk -F':' '/Active Physical CPUs/ {printf $2}')"
;;
esac esac
;; ;;
@ -1934,7 +1939,7 @@ get_cpu() {
[[ "$cpu_cores" != "off" && "$cores" ]] && \ [[ "$cpu_cores" != "off" && "$cores" ]] && \
case "$os" in case "$os" in
"Mac OS X") cpu="${cpu/@/(${cores}) @}" ;; "Mac OS X") cpu="${cpu/@/(${cores}) @}" ;;
*) cpu="$cpu ($cores)" ;; *) cpu="$cpu ($cores)" ;;
esac esac
# Add CPU speed to the output. # Add CPU speed to the output.
@ -1974,14 +1979,17 @@ get_cpu_usage() {
if [[ "$cpu_cores" != "logical" ]]; then if [[ "$cpu_cores" != "logical" ]]; then
case "$os" in case "$os" in
"Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; "Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;;
"Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;; "Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;;
"BSD") cores="$(sysctl -n hw.ncpu)" ;; "BSD") cores="$(sysctl -n hw.ncpu)" ;;
"Solaris") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; "Solaris") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;;
"Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;;
"iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;;
"AIX") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;; "IRIX") cores="$(sysconf NPROC_ONLN)" ;;
"IRIX") cores="$(sysconf NPROC_ONLN)" ;; "FreeMiNT") cores="$(sysctl -n hw.ncpu)" ;;
"FreeMiNT") cores="$(sysctl -n hw.ncpu)"
"AIX")
cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')"
;;
esac esac
fi fi
@ -1992,10 +2000,10 @@ get_cpu_usage() {
# Print the bar. # Print the bar.
case "$cpu_display" in case "$cpu_display" in
"bar") cpu_usage="$(bar "$cpu_usage" 100)" ;; "bar") cpu_usage="$(bar "$cpu_usage" 100)" ;;
"infobar") cpu_usage="${cpu_usage}% $(bar "$cpu_usage" 100)" ;; "infobar") cpu_usage="${cpu_usage}% $(bar "$cpu_usage" 100)" ;;
"barinfo") cpu_usage="$(bar "$cpu_usage" 100)${info_color} ${cpu_usage}%" ;; "barinfo") cpu_usage="$(bar "$cpu_usage" 100)${info_color} ${cpu_usage}%" ;;
*) cpu_usage="${cpu_usage}%" ;; *) cpu_usage="${cpu_usage}%" ;;
esac esac
} }