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

Added lsb_release to distro detection

Browse source
This commit is contained in:
Dylan 2016-01-19 10:42:41 +11:00
parent 44517d2cd4
commit aa8e64c1be
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
fetch
View file

@ -293,6 +293,9 @@ case "$os" in
"Linux" ) "Linux" )
if type -p crux >/dev/null 2>&1; then if type -p crux >/dev/null 2>&1; then
distro="CRUX" distro="CRUX"
elif type -p lsb_release >/dev/null 2>&1; then
distro="$(lsb_release -a | awk -F':' '/Description/ {printf $2}')"
distro=${distro/[[:space:]]/}
else else
distro="$(grep -h '^NAME=' /etc/*ease)" distro="$(grep -h '^NAME=' /etc/*ease)"
distro=${distro#NAME\=*} distro=${distro#NAME\=*}
@ -314,7 +317,7 @@ case "$os" in
distro=${distro%% *} distro=${distro%% *}
;; ;;
"Windows") "Windows")
case "$(cmd /c ver)" in case "$(cmd /c ver)" in
*"XP"*) *"XP"*)
distro="Windows XP" distro="Windows XP"
@ -400,7 +403,7 @@ getuptime () {
"Windows") "Windows")
uptime=$(uptime | awk -F ':[0-9]{2}+ |(, ){1}+' '{printf $2}') uptime=$(uptime | awk -F ':[0-9]{2}+ |(, ){1}+' '{printf $2}')
uptime=${uptime/ / } uptime=${uptime/[[:space:]]}
;; ;;
*) *)
@ -486,7 +489,7 @@ getpackages () {
;; ;;
esac esac
packages=${packages// } packages=${packages/[[:space:]]/}
} }
# Get shell # Get shell
@ -554,7 +557,7 @@ getcpu () {
"OpenBSD") "OpenBSD")
cpu="$(sysctl -n hw.model)" cpu="$(sysctl -n hw.model)"
cpu=${cpu/ @*/} cpu=${cpu/ @*/}
cpu=${cpu// /} cpu=${cpu/[[:space:]]/}
cpu=${cpu% } cpu=${cpu% }
speed=$(sysctl -n hw.cpuspeed) speed=$(sysctl -n hw.cpuspeed)
@ -574,7 +577,7 @@ getcpu () {
cpu="$(grep -F 'model name' /proc/cpuinfo)" cpu="$(grep -F 'model name' /proc/cpuinfo)"
cpu=${cpu/model name*: /} cpu=${cpu/model name*: /}
cpu=${cpu/ @*/} cpu=${cpu/ @*/}
cpu=${cpu// /} cpu=${cpu/[[:space:]]/}
cpu=${cpu% } cpu=${cpu% }
# Get cpu speed # Get cpu speed
@ -618,13 +621,13 @@ getmemory () {
# Do some substitution on each line # Do some substitution on each line
memtotal=${memtotal/MemTotal:/} memtotal=${memtotal/MemTotal:/}
memtotal=${memtotal/kB*/} memtotal=${memtotal/kB*/}
memtotal=${memtotal// /} memtotal=${memtotal/[[:space:]]/}
memfree=${memfree/MemFree:/} memfree=${memfree/MemFree:/}
memfree=${memfree/kB*/} memfree=${memfree/kB*/}
memfree=${memfree// /} memfree=${memfree/[[:space:]]/}
memavail=${memavail/MemAvailable:/} memavail=${memavail/MemAvailable:/}
memavail=${memavail/kB*/} memavail=${memavail/kB*/}
memavail=${memavail// /} memavail=${memavail/[[:space:]]/}
memused=$((memtotal - memavail)) memused=$((memtotal - memavail))
memory="$((memused / 1024))MB / $((memtotal / 1024))MB" memory="$((memused / 1024))MB / $((memtotal / 1024))MB"