mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-22 14:24:39 -07:00
* usr/lib/byobu/cpu_freq, usr/lib/byobu/include/shutil: LP: #909325
- use a leading zero on fpdiv operations, for consistency with awk-based math
This commit is contained in:
parent
3ef37f1921
commit
0fd8716579
3 changed files with 6 additions and 3 deletions
3
debian/changelog
vendored
3
debian/changelog
vendored
|
@ -4,6 +4,9 @@ byobu (5.1) unreleased; urgency=low
|
|||
- switch the order of the listed backends
|
||||
* debian/control: LP: #909221
|
||||
- depend on tmux, recommend screen
|
||||
* usr/lib/byobu/cpu_freq, usr/lib/byobu/include/shutil: LP: #909325
|
||||
- use a leading zero on fpdiv operations, for consistency with
|
||||
awk-based math
|
||||
|
||||
-- Dustin Kirkland <kirkland@ubuntu.com> Sat, 24 Dec 2011 17:35:04 -0600
|
||||
|
||||
|
|
|
@ -31,12 +31,12 @@ __cpu_freq() {
|
|||
freq="$_RET"
|
||||
else
|
||||
if egrep -q -s -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo; then
|
||||
freq=$(egrep -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo | awk -F"[:.]" '{ printf "%.1f", $2 / 1000 }')
|
||||
freq=$(egrep -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo | awk -F"[:.]" '{ printf "%01.1f", $2 / 1000 }')
|
||||
else
|
||||
# Must scale frequency by number of processors, if counting bogomips
|
||||
count=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo)
|
||||
freq=$(egrep -i -m 1 "^bogomips" /proc/cpuinfo | awk -F"[:.]" '{ print $2 }')
|
||||
freq=$(echo "$freq" "$count" | awk '{printf "%.1f\n", $1/$2/1000}')
|
||||
freq=$(echo "$freq" "$count" | awk '{printf "%01.1f\n", $1/$2/1000}')
|
||||
fi
|
||||
fi
|
||||
color b c W; printf "%s" "$freq"; color -; color c W; printf "%s" "$ICON_GHz"; color --
|
||||
|
|
|
@ -180,7 +180,7 @@ fpdiv() {
|
|||
n=${n%?}
|
||||
whole=${n%${chunk}}
|
||||
part=${n#${whole}}
|
||||
_RET=${whole}${part:+.${part}}
|
||||
_RET=${whole:-0}${part:+.${part}}
|
||||
return
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue