EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:dylanaraps/fetch

This commit is contained in:
Dylan 2016-02-24 16:50:24 +11:00
parent 35a01ac462 bc4c7a5fe4
commit 7aff0c2aaa
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fetch
View File

@ -706,7 +706,7 @@ getde () {
getwm () { getwm () {
if [ -n "$DISPLAY" ] && [ "$os" != "Mac OS X" ]; then if [ -n "$DISPLAY" ] && [ "$os" != "Mac OS X" ]; then
id="$(xprop -root -notype | \awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}')" id="$(xprop -root -notype | awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}')"
wm="$(xprop -id "$id" -notype -f _NET_WM_NAME 8t)" wm="$(xprop -id "$id" -notype -f _NET_WM_NAME 8t)"
wm=${wm/*_NET_WM_NAME = } wm=${wm/*_NET_WM_NAME = }
wm=${wm/\"} wm=${wm/\"}
@ -1014,12 +1014,8 @@ getmemory () {
"Windows") "Windows")
mem="$(awk 'NR < 3 {printf $2 " "}' /proc/meminfo)" mem="$(awk 'NR < 3 {printf $2 " "}' /proc/meminfo)"
# Split the string above into 2 vars memtotal=${mem/ *}
# This is faster than using an array. memfree=${mem#* }
set $mem
memtotal=$1
memfree=$2
memavail=$((memtotal - memfree)) memavail=$((memtotal - memfree))
memused=$((memtotal - memavail)) memused=$((memtotal - memavail))
memory="$((${memused%% *} / 1024))MB / " memory="$((${memused%% *} / 1024))MB / "