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

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

Browse source
This commit is contained in:
Dylan 2016-03-30 09:45:09 +11:00
commit c9e6e7ada0
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
neofetch
View file

@ -774,7 +774,7 @@ getshell () {
# Desktop Environment {{{ # Desktop Environment {{{
getde () { getde () {
[ "$XDG_CURRENT_DESKTOP" != "i3" ] && de="$XDG_CURRENT_DESKTOP" de="${XDG_CURRENT_DESKTOP/i3}"
} }
# }}} # }}}
@ -1081,8 +1081,8 @@ getgpu () {
getmemory () { getmemory () {
case "$os" in case "$os" in
"Linux" | "Windows") "Linux" | "Windows")
mem=($(awk -F ':| kB' '/MemTotal|MemFree|Buffers|Cached/ {printf $2}' /proc/meminfo ) 0 0) mem=($(awk -F ':| kB' '/MemTotal|MemFree|Buffers|Cached/ {printf $2}' /proc/meminfo))
memused=$((${mem[0]} - ${mem[1]} - ${mem[2]} - ${mem[3]})) memused=$((${mem[0]} - ${mem[1]} - ${mem[2]:-0} - ${mem[3]:-0}))
memused=$((memused / 1024)) memused=$((memused / 1024))
memtotal=$((${mem[0]} / 1024)) memtotal=$((${mem[0]} / 1024))
;; ;;
@ -1348,9 +1348,8 @@ getstyle () {
;; ;;
"Xfce"*) "Xfce"*)
if type -p xfconf-query >/dev/null 2>&1; then type -p xfconf-query >/dev/null 2>&1 && \
gtk2theme=$(xfconf-query -c xsettings -p /Net/$xfconf) gtk2theme=$(xfconf-query -c xsettings -p /Net/$xfconf)
fi
;; ;;
esac esac