luisgulo/neofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #505 from konimex/master

Browse source 
BSD: Use $kernel_name instead of $distro in some functions
This commit is contained in:
Dylan Araps 2016-12-05 22:52:31 +11:00 committed by GitHub
commit c6e1b21087
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
neofetch
View file

@ -815,8 +815,8 @@ get_cpu() {
# Get cpu temp # Get cpu temp
if [[ "$cpu_temp" == "on" ]]; then if [[ "$cpu_temp" == "on" ]]; then
case "$distro" in case "$kernel_name" in
"FreeBSD"* | "PacBSD"* | "DragonFly"* | "PCBSD"*) "FreeBSD"* | "DragonFly"*)
temp="$(sysctl -n dev.cpu.0.temperature)" temp="$(sysctl -n dev.cpu.0.temperature)"
temp="[${temp/C/°C}]" temp="[${temp/C/°C}]"
;; ;;
@ -1015,8 +1015,8 @@ get_gpu() {
;; ;;
"BSD" | "Solaris") "BSD" | "Solaris")
case "$distro" in case "$kernel_name" in
"FreeBSD"* | "DragonFlyBSD"* | "PacBSD"*) "FreeBSD"* | "DragonFly"*)
gpu="$(pciconf -lv | grep -B 4 -F "VGA" | grep -F "device")" gpu="$(pciconf -lv | grep -B 4 -F "VGA" | grep -F "device")"
gpu="${gpu/*device*= }" gpu="${gpu/*device*= }"
gpu="$(trim_quotes "$gpu")" gpu="$(trim_quotes "$gpu")"
@ -1075,13 +1075,13 @@ get_memory() {
"BSD") "BSD")
# Mem total # Mem total
case "$distro" in case "$kernel_name" in
"NetBSD"*) mem_total="$(($(sysctl -n hw.physmem64) / 1024 / 1024))" ;; "NetBSD"*) mem_total="$(($(sysctl -n hw.physmem64) / 1024 / 1024))" ;;
*) mem_total="$(($(sysctl -n hw.physmem) / 1024 / 1024))" ;; *) mem_total="$(($(sysctl -n hw.physmem) / 1024 / 1024))" ;;
esac esac
# Mem free # Mem free
case "$distro" in case "$kernel_name" in
"NetBSD"*) mem_free="$(($(awk -F ':|kB' '/MemFree:/ {printf $2}' /proc/meminfo) / 1024))" ;; "NetBSD"*) mem_free="$(($(awk -F ':|kB' '/MemFree:/ {printf $2}' /proc/meminfo) / 1024))" ;;
"FreeBSD"* | "DragonFly"*) "FreeBSD"* | "DragonFly"*)
mem_free="$(top -d 1 | awk -F ',' '/^Mem:/ {print $5}')" mem_free="$(top -d 1 | awk -F ',' '/^Mem:/ {print $5}')"
@ -1093,7 +1093,7 @@ get_memory() {
esac esac
# Mem used # Mem used
case "$distro" in case "$kernel_name" in
"OpenBSD"*) mem_used="$(($(vmstat | awk 'END{printf $4}') / 1024))" ;; "OpenBSD"*) mem_used="$(($(vmstat | awk 'END{printf $4}') / 1024))" ;;
*) mem_used="$((mem_total - mem_free))" ;; *) mem_used="$((mem_total - mem_free))" ;;
esac esac
@ -1607,7 +1607,7 @@ get_disk() {
"Mac OS X" | "BSD" | "Haiku") "Mac OS X" | "BSD" | "Haiku")
case "$distro" in case "$distro" in
"FreeBSD"* | *"OS X"* | "Mac"* ) "FreeBSD"* | *"OS X"* | "Mac"*)
df_flags="-l -H /" df_flags="-l -H /"
df_dir="/" df_dir="/"
;; ;;
@ -1683,7 +1683,7 @@ get_battery() {
;; ;;
"BSD") "BSD")
case "$distro" in case "$kernel_name" in
"FreeBSD"* | "DragonFly"*) "FreeBSD"* | "DragonFly"*)
battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}')" battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}')"
battery_state="$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}')" battery_state="$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}')"
@ -1803,7 +1803,7 @@ get_birthday() {
;; ;;
"BSD") "BSD")
case "$distro" in case "$kernel_name" in
"OpenBSD"* | "Bitrig"*) "OpenBSD"* | "Bitrig"*)
birthday="$(ls -alctT / | awk '/lost\+found/ {printf $6 " " $7 " " $9 " " $8}')" birthday="$(ls -alctT / | awk '/lost\+found/ {printf $6 " " $7 " " $9 " " $8}')"
birthday_shorthand="on" birthday_shorthand="on"