* usr/lib/byobu/ec2_cost, usr/share/byobu/status/statusrc,

usr/share/man/man1/byobu.1: LP: #929907
  - disable the ec2_cost plugin if not running in EC2,
    allow override with EC2_ESTIMATE=1 in ~/.byobu/statusrc
This commit is contained in:
Dustin Kirkland 2012-02-21 21:40:56 -06:00
commit 5cd040cc0b
4 changed files with 13 additions and 1 deletions

4
debian/changelog vendored
View file

@ -6,6 +6,10 @@ byobu (5.13) unreleased; urgency=low
- check tput for 256 color support before defaulting to that in tmux mode - check tput for 256 color support before defaulting to that in tmux mode
* usr/lib/byobu/disk_io: LP: #934893 * usr/lib/byobu/disk_io: LP: #934893
- initialize the x1 value correctly - initialize the x1 value correctly
* usr/lib/byobu/ec2_cost, usr/share/byobu/status/statusrc,
usr/share/man/man1/byobu.1: LP: #929907
- disable the ec2_cost plugin if not running in EC2,
allow override with EC2_ESTIMATE=1 in ~/.byobu/statusrc
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 16 Feb 2012 23:58:36 -0600 -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 16 Feb 2012 23:58:36 -0600

View file

@ -47,6 +47,8 @@ __ec2_cost() {
file_to_stat="$cache.type" file_to_stat="$cache.type"
fi fi
if [ -z "$rate" ]; then if [ -z "$rate" ]; then
# No instance type/rate, exit immediately unless we explicitly want an estimate
[ "$EC2_ESTIMATE" = "1" ] || return
. "$BYOBU_PREFIX/share/$PKG/ec2/rates."* . "$BYOBU_PREFIX/share/$PKG/ec2/rates."*
# Count CPUs, Memory, Architecture, hours # Count CPUs, Memory, Architecture, hours
cpu=$(grep -c "^processor.*:" /proc/cpuinfo) || cpu=1 cpu=$(grep -c "^processor.*:" /proc/cpuinfo) || cpu=1

View file

@ -72,3 +72,9 @@
# to instead count number of distinct users logged onto the system # to instead count number of distinct users logged onto the system
# Default: 0 # Default: 0
#USERS_DISTINCT=0 #USERS_DISTINCT=0
# If we're not in EC2 (ie, no metadata service, and no known instance type), the
# ec2_cost status is disabled by default. To override, and get an esitmate, set
# this to '1'.
# Default: 0
#EC2_ESTIMATE=0

View file

@ -47,7 +47,7 @@ Note that BYOBU_CONFIG_DIR=\fI$XDG_CONFIG_HOME/byobu\fP if defined, and \fI$HOME
\fBdistro\fP \- OS/distribution name of the release running on the current system as reported by \fBlsb_release(1)\fP or \fI/etc/issue\fP; displayed in the lower bar in bold black text toward the left on a grey background; you may override the detected release with DISTRO=Whatever in \fI$BYOBU_CONFIG_DIR/statusrc\fP \fBdistro\fP \- OS/distribution name of the release running on the current system as reported by \fBlsb_release(1)\fP or \fI/etc/issue\fP; displayed in the lower bar in bold black text toward the left on a grey background; you may override the detected release with DISTRO=Whatever in \fI$BYOBU_CONFIG_DIR/statusrc\fP
\fBec2_cost\fP \- an estimation of the cost of the current boot of the system in terms of the Amazon EC2 billing model; displayed in the lower bar toward the right in green text on a black background; there is a leading '~' to indicate that this is an estimation, and the monetary units are US Dollars '$' \fBec2_cost\fP \- an estimation of the cost of the current boot of the system in terms of the Amazon EC2 billing model; displayed in the lower bar toward the right in green text on a black background; there is a leading '~' to indicate that this is an estimation, and the monetary units are US Dollars '$'; if not running in EC2, this plugin is disabled unless EC2_ESTIMATE=1 in \fI~/.byobu/statusrc\fP
\fBentropy\fP \- a count of the system's current entropy in bytes; displayed in the lower bar toward the right in yellow text on a dark grey background; there is a leading 'e' to indicate 'entropy' \fBentropy\fP \- a count of the system's current entropy in bytes; displayed in the lower bar toward the right in yellow text on a dark grey background; there is a leading 'e' to indicate 'entropy'