Merge pull request #198 from dylanaraps/misc_fixes

Misc fixes
This commit is contained in:
Dylan Araps 2016-03-30 09:31:20 +11:00
commit 8dd6e98c93

View file

@ -774,7 +774,7 @@ getshell () {
# Desktop Environment {{{
getde () {
[ "$XDG_CURRENT_DESKTOP" != "i3" ] && de="$XDG_CURRENT_DESKTOP"
de="${XDG_CURRENT_DESKTOP/i3}"
}
# }}}
@ -1092,8 +1092,8 @@ getgpu () {
getmemory () {
case "$os" in
"Linux" | "Windows")
mem=($(awk -F ':| kB' '/MemTotal|MemFree|Buffers|Cached/ {printf $2}' /proc/meminfo ) 0 0)
memused=$((${mem[0]} - ${mem[1]} - ${mem[2]} - ${mem[3]}))
mem=($(awk -F ':| kB' '/MemTotal|MemFree|Buffers|Cached/ {printf $2}' /proc/meminfo))
memused=$((${mem[0]} - ${mem[1]} - ${mem[2]:-0} - ${mem[3]:-0}))
memused=$((memused / 1024))
memtotal=$((${mem[0]} / 1024))
;;
@ -1359,9 +1359,8 @@ getstyle () {
;;
"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)
fi
;;
esac