* usr/lib/byobu/include/shutil, usr/lib/byobu/Makefile.am,

usr/lib/byobu/rcs_cost, usr/share/byobu/status/status,
  usr/share/man/man1/byobu.1:
  - deprecate some unmaintained functionality
This commit is contained in:
Dustin Kirkland 2018-08-12 08:52:06 -05:00
commit 16c3a5e122
6 changed files with 10 additions and 108 deletions

4
debian/changelog vendored
View file

@ -7,6 +7,10 @@ byobu (5.127) unreleased; urgency=medium
* usr/lib/byobu/logo: LP: #1769676 * usr/lib/byobu/logo: LP: #1769676
- don't use the Ubuntu logo in the status line, as this breaks ssh - don't use the Ubuntu logo in the status line, as this breaks ssh
clients coming to Ubuntu from other OSes without the Ubuntu font clients coming to Ubuntu from other OSes without the Ubuntu font
* usr/lib/byobu/include/shutil, usr/lib/byobu/Makefile.am,
usr/lib/byobu/rcs_cost, usr/share/byobu/status/status,
usr/share/man/man1/byobu.1:
- deprecate some unmaintained functionality
-- Dustin Kirkland <kirkland@ubuntu.com> Sun, 27 May 2018 18:07:11 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Sun, 27 May 2018 18:07:11 -0500

View file

@ -1,3 +1,3 @@
libdirdir = $(prefix)/lib/@PACKAGE@ libdirdir = $(prefix)/lib/@PACKAGE@
libdir_SCRIPTS = apport arch battery cpu_count cpu_freq cpu_temp color custom date disk disk_io distro entropy ec2_cost fan_speed hostname ip_address load_average logo mail memory menu network processes raid rcs_cost reboot_required release services session swap time time_binary time_utc trash updates_available uptime users whoami wifi_quality libdir_SCRIPTS = apport arch battery cpu_count cpu_freq cpu_temp color custom date disk disk_io distro entropy ec2_cost fan_speed hostname ip_address load_average logo mail memory menu network processes raid reboot_required release services session swap time time_binary time_utc trash updates_available uptime users whoami wifi_quality

View file

@ -261,7 +261,6 @@ status_freq() {
notify_osd) _RET=9999991 ;; notify_osd) _RET=9999991 ;;
processes) _RET=7 ;; processes) _RET=7 ;;
raid) _RET=59 ;; raid) _RET=59 ;;
rcs_cost) _RET=613 ;;
reboot_required) _RET=5 ;; reboot_required) _RET=5 ;;
release) _RET=599 ;; release) _RET=599 ;;
services) _RET=53 ;; services) _RET=53 ;;

View file

@ -1,99 +0,0 @@
#!/bin/sh -e
#
# rcs_cost: approximate Rackspace Cloud Server cost (USD) of the current instance
#
# Copyright (C) 2009-2010 Jon Bernard
# Copyright (C) 2011-2014 Dustin Kirkland
#
# Author(s): Jon Bernard <jbernard@debian.org>
# Dustin Kirkland <kirkland@byobu.org>
#
# Derived from byobu's ec2_cost written by Dustin Kirkland, see
# Byobu's project page: http://byobu.org for more information
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
__rcs_cost_detail() {
DETAIL=1
__rcs_cost
}
__rcs_cost() {
# Approximate Instance Cost Basis
# Memory US
# 256MB $0.015/h
# 512MB $0.030/h
# 1024MB $0.060/h
# 2048MB $0.120/h
# 4096MB $0.240/h
# 8192MB $0.480/h
# 15872MB $0.960/h
# Instance memory
memory=`grep "^MemTotal:" /proc/meminfo | awk '{print $2}'`
# Round memory down to the nearest multiple of 64MB
memory=$((${memory} - (${memory} % (64 * 1024))))
# Apply the going rate
INCREMENTS="256 512 1024 2048 4096 8192 16384 32768 65536"
for X in ${INCREMENTS}; do
test "$((${X} * 1024 + 65536))" -ge ${memory} && break
done
MEMORY_RATE=`printf "%s" "$X" | awk '{printf "%f", $1 / 256 * 15 / 1000}'`
# Data Transfer Cost Basis
# Incoming $0.08/GB
# Outgoing $0.22/GB
RX_RATE="0.08"
TX_RATE="0.22"
# Auto detect network interface
[ -r "/proc/net/route" ] || return
IF=$(tail -n1 /proc/net/route | awk '{print $1}')
ifconfig_out=`LC_ALL=C /sbin/ifconfig "$IF"`
# Calculate bandwidth cost
tx_gb=${ifconfig_out#*RX bytes:}
tx_gb=$(printf "%s" ${tx_gb%% *} | awk '{ printf "%f", $1 / 1024 / 1024 / 1024 }')
rx_gb=${ifconfig_out#*TX bytes:}
rx_gb=$(printf "%s" ${rx_gb%% *} | awk '{ printf "%f", $1 / 1024 / 1024 / 1024 }')
network_cost=`printf "%s" "$tx_gb" "$TX_RATE" "$rx_gb" "$RX_RATE" | awk '{printf "%f %f", $1*$2, $3*$4}' | awk '{printf "%f", $1 + $2}'`
# Calculate uptime cost
hours=$(((`date +%s` - `stat --printf %Z /etc/hostname`) / 60 / 60 + 1))
uptime_cost=`printf "%s" "$hours" | awk "{printf \"%f\", "$MEMORY_RATE" * $hours}"`
total_cost=`printf "%s %s" "$network_cost" "$uptime_cost" | awk '{printf "%.2f", $1 + $2}'`
if [ "$DETAIL" = "1" ]; then
echo "=========================================================="
echo "Estimated cost in Rackspace Cloud Server since last reboot"
echo "=========================================================="
echo " Network sent: $tx_gb GB @ \$$RX_RATE/GB"
echo " Network recv: $rx_gb GB @ \$$TX_RATE/GB"
echo " Network cost: \$$network_cost"
echo "----------------------------------------------------------"
echo " Uptime: $hours hr @ \$$MEMORY_RATE/hr"
echo " Uptime cost: \$$uptime_cost"
echo "----------------------------------------------------------"
echo "Total cost: ~\$$total_cost"
echo "=========================================================="
return
fi
[ -n "$total_cost" ] || return
color K G; printf "R\$%s"; color -; color b K G; printf "%s" "$total_cost"; color --
}
# vi: syntax=sh ts=4 noexpandtab

View file

@ -26,12 +26,12 @@
screen_upper_left="color" screen_upper_left="color"
screen_upper_right="color whoami hostname ip_address menu" screen_upper_right="color whoami hostname ip_address menu"
screen_lower_left="color logo distro release #arch session" screen_lower_left="color logo distro release #arch session"
screen_lower_right="color network #disk_io custom #entropy raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #rcs_cost #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap disk #time_utc date time" screen_lower_right="color network #disk_io custom #entropy raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap disk #time_utc date time"
# Tmux has one status line, with 2 halves for status # Tmux has one status line, with 2 halves for status
tmux_left="logo #distro release #arch session" tmux_left="logo #distro release #arch session"
# You can have as many tmux right lines below here, and cycle through them using Shift-F5 # You can have as many tmux right lines below here, and cycle through them using Shift-F5
tmux_right="#network #disk_io #custom #entropy raid reboot_required updates_available #apport #services #mail #users uptime #ec2_cost #rcs_cost #fan_speed #cpu_temp #battery #wifi_quality #processes load_average cpu_count cpu_freq memory #swap disk #whoami #hostname #ip_address #time_utc date time" tmux_right="#network #disk_io #custom #entropy raid reboot_required updates_available #apport #services #mail #users uptime #ec2_cost #fan_speed #cpu_temp #battery #wifi_quality #processes load_average cpu_count cpu_freq memory #swap disk #whoami #hostname #ip_address #time_utc date time"
#tmux_right="network #disk_io #custom entropy raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #rcs_cost fan_speed cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk whoami hostname ip_address #time_utc date time" #tmux_right="network #disk_io #custom entropy raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost fan_speed cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk whoami hostname ip_address #time_utc date time"
#tmux_right="network #disk_io custom #entropy raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #rcs_cost #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk #whoami #hostname ip_address #time_utc date time" #tmux_right="network #disk_io custom #entropy raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk #whoami #hostname ip_address #time_utc date time"
#tmux_right="#network disk_io #custom entropy #raid #reboot_required #updates_available #apport #services #mail #users #uptime #ec2_cost #rcs_cost fan_speed cpu_temp #battery #wifi_quality #processes #load_average #cpu_count #cpu_freq #memory #swap whoami hostname ip_address #time_utc disk date time" #tmux_right="#network disk_io #custom entropy #raid #reboot_required #updates_available #apport #services #mail #users #uptime #ec2_cost fan_speed cpu_temp #battery #wifi_quality #processes #load_average #cpu_count #cpu_freq #memory #swap whoami hostname ip_address #time_utc disk date time"

View file

@ -57,8 +57,6 @@ The background colors of the \fBbyobu\fP status lines can be adjusted by editing
\fBraid\fP \- note very prominently if there is a RAID failure detected, in red blinking text on a white background; the term 'RAID' notes that there is something wrong with the RAID, and if there is a rebuild/resync in progress, the percent complete is also shown \fBraid\fP \- note very prominently if there is a RAID failure detected, in red blinking text on a white background; the term 'RAID' notes that there is something wrong with the RAID, and if there is a rebuild/resync in progress, the percent complete is also shown
\fBrcs_cost\fP \- an estimation of the cost of the current boot of the system in terms of the Rackspace Cloud Server 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 '$'
\fBfan_speed\fP \- cpu or system fan speed as reported by lm-sensors; displayed in the lower bar toward the right in black text on a grey background; there is a trailing 'rpm' for units; you may override the detected fan by setting FAN=/sys/path/to/your/fan1_input in \fI$BYOBU_CONFIG_DIR/statusrc\fP \fBfan_speed\fP \- cpu or system fan speed as reported by lm-sensors; displayed in the lower bar toward the right in black text on a grey background; there is a trailing 'rpm' for units; you may override the detected fan by setting FAN=/sys/path/to/your/fan1_input in \fI$BYOBU_CONFIG_DIR/statusrc\fP
\fBhostname\fP \- the hostname of the system; displayed in the upper bar on the far right in bold black text on a grey background; there is a leading '@' symbol if the username status is also enabled \fBhostname\fP \- the hostname of the system; displayed in the upper bar on the far right in bold black text on a grey background; there is a leading '@' symbol if the username status is also enabled