github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 14:24:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/lib/byobu/custom, usr/lib/byobu/disk_io, usr/lib/byobu/ec2_cost,

Browse source 
usr/lib/byobu/network, usr/lib/byobu/reboot_required,
  usr/lib/byobu/updates_available:
  - must separate run dirs for tmux/screen run status scripts;
    otherwise, calculated rates are off
This commit is contained in:
Dustin Kirkland 2011-08-16 14:15:48 -07:00
commit a033d3d065
7 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
debian/changelog vendored
View file

@ -53,6 +53,11 @@ byobu (4.30) unreleased; urgency=low
rather than a file stat rather than a file stat
* usr/share/byobu/profiles/tmux: * usr/share/byobu/profiles/tmux:
- ensure that byobu-janitor runs on reload - ensure that byobu-janitor runs on reload
* usr/lib/byobu/custom, usr/lib/byobu/disk_io, usr/lib/byobu/ec2_cost,
usr/lib/byobu/network, usr/lib/byobu/reboot_required,
usr/lib/byobu/updates_available:
- must separate run dirs for tmux/screen run status scripts;
otherwise, calculated rates are off
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 11 Aug 2011 10:31:31 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 11 Aug 2011 10:31:31 -0500

2
usr/lib/byobu/custom
View file

@ -24,7 +24,7 @@ __custom_detail() {
} }
__custom() { __custom() {
local cache="$BYOBU_RUN_DIR/custom" local cache="$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND/custom"
local i= output= local i= output=
for i in "$BYOBU_CONFIG_DIR/bin/"[0-9]*_*; do for i in "$BYOBU_CONFIG_DIR/bin/"[0-9]*_*; do
# Loop over custom scripts # Loop over custom scripts

2
usr/lib/byobu/disk_io
View file

@ -54,7 +54,7 @@ __disk_io() {
local disk=${_RET} local disk=${_RET}
local t2=`date +%s` t1= local t2=`date +%s` t1=
for i in "read" "write"; do for i in "read" "write"; do
local cache="$BYOBU_RUN_DIR/disk.$i" local cache="$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND/disk.$i"
t1=`stat -c %Y "$cache"` 2>/dev/null || t1=0 t1=`stat -c %Y "$cache"` 2>/dev/null || t1=0
local unit="kB/s" local unit="kB/s"
local rate= x1= x2= symbol= unit= local rate= x1= x2= symbol= unit=

2
usr/lib/byobu/ec2_cost
View file

@ -39,7 +39,7 @@ __ec2_cost() {
. "$BYOBU_PREFIX/share/$PKG/ec2/rates.${zone%?}" . "$BYOBU_PREFIX/share/$PKG/ec2/rates.${zone%?}"
type=$(wget -q -O - http://169.254.169.254/latest/meta-data/instance-type | $SED -e "s/\./_/g") type=$(wget -q -O - http://169.254.169.254/latest/meta-data/instance-type | $SED -e "s/\./_/g")
eval rate="\$$type" eval rate="\$$type"
file_to_stat="$BYOBU_RUN_DIR/ec2_cost.instance_type" file_to_stat="$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND/ec2_cost.instance_type"
[ -f "$file_to_stat" ] || wget -q -O "$file_to_stat" http://169.254.169.254/latest/meta-data/instance-type [ -f "$file_to_stat" ] || wget -q -O "$file_to_stat" http://169.254.169.254/latest/meta-data/instance-type
else else
. "$BYOBU_PREFIX/share/$PKG/ec2/rates."* . "$BYOBU_PREFIX/share/$PKG/ec2/rates."*

2
usr/lib/byobu/network
View file

@ -39,7 +39,7 @@ __network() {
up) symbol="$ICON_UP" ;; up) symbol="$ICON_UP" ;;
down) symbol="$ICON_DN" ;; down) symbol="$ICON_DN" ;;
esac esac
cache="$BYOBU_RUN_DIR/network.$i" cache="$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND/network.$i"
[ -r "$cache" ] && read x1 < "$cache" || tx1=0 [ -r "$cache" ] && read x1 < "$cache" || tx1=0
IFS="$OIFS:" IFS="$OIFS:"
while read iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed; do while read iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed; do

2
usr/lib/byobu/reboot_required
View file

@ -20,7 +20,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
REBOOT_FLAG="/var/run/reboot-required" REBOOT_FLAG="/var/run/reboot-required"
RELOAD_FLAG="$BYOBU_RUN_DIR/reload-required" RELOAD_FLAG="$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND/reload-required"
__reboot_required_detail() { __reboot_required_detail() {
[ -e "$REBOOT_FLAG" ] && ls -alF "$REBOOT_FLAG" 2>&1 [ -e "$REBOOT_FLAG" ] && ls -alF "$REBOOT_FLAG" 2>&1

2
usr/lib/byobu/updates_available
View file

@ -102,7 +102,7 @@ __updates_available_detail() {
} }
__updates_available() { __updates_available() {
local mycache="$BYOBU_RUN_DIR/updates-available" local mycache="$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND/updates-available"
# If mycache is present, use it # If mycache is present, use it
[ -r $mycache ] && ___print_updates `$SED -n '/[^0-9]/s/ .*$//p' $mycache` [ -r $mycache ] && ___print_updates `$SED -n '/[^0-9]/s/ .*$//p' $mycache`
# If we really need to do so (mycache doesn't exist, or the package database has changed), # If we really need to do so (mycache doesn't exist, or the package database has changed),