Merge branch 'develop': post release fixes

This commit is contained in:
Olivier Mengué 2013-12-02 15:01:14 +01:00
commit 4840795bf7

View File

@ -769,6 +769,7 @@ _lp_git_branch_color()
fi fi
local shortstat local shortstat
local ret
shortstat="$(LC_ALL=C \git diff --shortstat HEAD 2>/dev/null)" shortstat="$(LC_ALL=C \git diff --shortstat HEAD 2>/dev/null)"
if [[ -n "$shortstat" ]] ; then if [[ -n "$shortstat" ]] ; then
local has_lines local has_lines
@ -1393,7 +1394,7 @@ _lp_temp_sensors() {
temperature=$i temperature=$i
fi fi
done done
echo -ne "$(($temperature/$count))" echo -ne "$temperature"
} }
# Will set _LP_TEMP_FUNCTION so the temperature monitoring feature use an # Will set _LP_TEMP_FUNCTION so the temperature monitoring feature use an