Hello community, here is the log from the commit of package byobu for openSUSE:Factory checked in at 2018-08-31 10:42:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/byobu (Old) and /work/SRC/openSUSE:Factory/.byobu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "byobu" Fri Aug 31 10:42:30 2018 rev:5 rq:631190 version:5.127 Changes: -------- --- /work/SRC/openSUSE:Factory/byobu/byobu.changes 2018-05-29 10:48:21.728871573 +0200 +++ /work/SRC/openSUSE:Factory/.byobu.new/byobu.changes 2018-08-31 10:43:42.999150453 +0200 @@ -1,0 +2,47 @@ +Mon Aug 13 21:53:25 UTC 2018 - tejas.gurusw...@opensuse.org + +- update to 5.127. key changes: + * usr/share/byobu/profiles/bashrc: + - Googley PS1 for non-Ubuntu distros + * 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, + usr/lib/byobu/ec2_cost, + usr/lib/byobu/include/ec2instancespricing.py, + usr/lib/byobu/include/Makefile.am, usr/lib/byobu/include/shutil, + usr/lib/byobu/Makefile.am, usr/share/byobu/status/status, + usr/share/man/man1/byobu.1, + * usr/bin/byobu-janitor.in: + - deprecate unmaintained ec2/rcs pricing functionality + - this never really worked well, and these prices are constantly changing + - clear out stale status cache + * debian/control, usr/lib/byobu/ip_address, usr/lib/byobu/network, + usr/share/man/man1/wifi-status.1: LP: #1748956 + - switch entirely to iproute2, away from net-tools and ifconfig + - only remaining ifconfig is fall-back logic, in case /sbin/ip is + not found + * usr/bin/byobu-select-profile.in, usr/share/man/man1/byobu-select- + profile.1: LP: #1717746 + - deprecate interactive mode for byobu-select-profile + * usr/lib/byobu/include/toggle-utf8.in: LP: #1696546 + - try to support zsh and other shells in addition to bash + * usr/share/byobu/profiles/bashrc: + - fix missing bash 256 ps1 colors + * usr/lib/byobu/include/constants, usr/share/byobu/keybindings/f- + keys.screen, usr/share/byobu/keybindings/f-keys.tmux: + - create a $BYOBU_EDITOR variable, using "sensible-editor" if found + (it will be on Debian/Ubuntu systems), or $EDITOR if not, and falling + back to "vim" in the case where none are found + - use $BYOBU_EDITOR with Shift-F7 to open the printscreen buffer in + a new window; this fixes a bug on some distros where $EDITOR might + be undefined + * usr/lib/byobu/session: + - don't count sessions that start with _ BUG: #892489 + * usr/lib/byobu/updates_available: + - Fix rare race condition for update_needed and cache file (#26) + - https://github.com/dustinkirkland/byobu/pull/26 + * byobu.desktop: + - give some hints for GNOME Shell to correctly match byobu desktop file + (LP: #1718482); partial fix, not entirely working yet + +------------------------------------------------------------------- Old: ---- byobu_5.125.orig.tar.gz byobu_5.125.orig.tar.gz.asc New: ---- byobu_5.127.orig.tar.gz byobu_5.127.orig.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ byobu.spec ++++++ --- /var/tmp/diff_new_pack.UMuTbY/_old 2018-08-31 10:43:43.543151100 +0200 +++ /var/tmp/diff_new_pack.UMuTbY/_new 2018-08-31 10:43:43.547151105 +0200 @@ -2,6 +2,7 @@ # spec file for package byobu # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 Tejas Guruswamy <tejas.gurusw...@opensuse.org>. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +18,12 @@ Name: byobu -Version: 5.125 +Version: 5.127 Release: 0 Summary: Enhanced profile and configuration utilities for GNU Screen and tmux License: GPL-3.0-only Group: System/Console -Url: http://byobu.org/ +URL: http://byobu.org/ Source: https://launchpad.net/%{name}/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz Source1: https://launchpad.net/%{name}/trunk/%{version}/+download/..-%{name}_%{version}.orig.tar.gz.asc#/%{name}_%{version}.orig.tar.gz.asc Source2: %{name}.keyring @@ -39,14 +40,13 @@ Requires: net-tools Requires: snack Recommends: pastebinit -Recommends: tmux Recommends: sensible-utils +Recommends: tmux Suggests: %{name}-doc Suggests: screen Suggests: wireless-tools BuildArch: noarch %{perl_requires} -%py_requires %package doc Summary: Documentation files for byobu @@ -85,7 +85,8 @@ %fdupes %{buildroot}%{_mandir}/ %files -%doc AUTHORS COPYING README +%license COPYING +%doc AUTHORS README %config %{_sysconfdir}/profile.d/Z97-%{name}.*sh %dir %{_sysconfdir}/%{name}/ %config(noreplace) %{_sysconfdir}/%{name}/* ++++++ byobu_5.125.orig.tar.gz -> byobu_5.127.orig.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/ChangeLog new/byobu-5.127/ChangeLog --- old/byobu-5.125/ChangeLog 2018-03-16 17:28:28.000000000 +0100 +++ new/byobu-5.127/ChangeLog 2018-08-12 18:35:59.000000000 +0200 @@ -1,4 +1,90 @@ -byobu (5.125) released; urgency=medium +byobu (5.127) released; urgency=medium + + * usr/share/byobu/profiles/bashrc: + - Googley PS1 for non-Ubuntu distros + * usr/lib/byobu/logo, usr/share/byobu/profiles/bashrc: + - use Google lego logo for gLinux + * usr/lib/byobu/logo: LP: #1769676 + - 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 + * 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, + usr/lib/byobu/ec2_cost, + usr/lib/byobu/include/ec2instancespricing.py, + usr/lib/byobu/include/Makefile.am, usr/lib/byobu/include/shutil, + usr/lib/byobu/Makefile.am, usr/share/byobu/status/status, + usr/share/man/man1/byobu.1, + * usr/bin/byobu-janitor.in: + - deprecate unmaintained ec2/rcs pricing functionality + - this never really worked well, and these prices are constantly changing + - clear out stale status cache + * debian/control, usr/lib/byobu/ip_address, usr/lib/byobu/network, + usr/share/man/man1/wifi-status.1: LP: #1748956 + - switch entirely to iproute2, away from net-tools and ifconfig + - only remaining ifconfig is fall-back logic, in case /sbin/ip is + not found + * usr/share/byobu/desktop/byobu.desktop: LP: #1739708 + - update categories so that Byobu can show up in Cinnamon/Mint's + preferred applications list + * usr/share/byobu/pixmaps/byobu.14.png, + usr/share/byobu/pixmaps/byobu.192.png, + usr/share/byobu/pixmaps/byobu.64.png, + usr/share/byobu/pixmaps/byobu.png: + - re-render png's, as Chrome started rendering middle color wrong + * usr/bin/byobu-select-profile.in, usr/share/man/man1/byobu-select- + profile.1: LP: #1717746 + - deprecate interactive mode for byobu-select-profile + * usr/lib/byobu/include/toggle-utf8.in: LP: #1696546 + - try to support zsh and other shells in addition to bash + * usr/bin/byobu-shell.in: + - update getting started to byobu.org + * usr/share/byobu/profiles/tmux: LP: #1617689 + - add a comment about motd printing + * usr/share/man/man1/byobu.1: LP: #1618185 + - update documentation on setting a logo + * debian/compat, debian/control: + * debian/compat, debian/control, usr/lib/byobu/include/config.py.in, + usr/lib/byobu/include/select-session.py: + - neverending fight with lintian + - hardcode python3 as our interpreter + * usr/lib/byobu/include/shutil: + - check for lsb-release before using (not present on Debian) + * usr/share/byobu/profiles/bashrc: + - fix missing bash 256 ps1 colors + + -- Dustin Kirkland <kirkl...@ubuntu.com> Sun, 27 May 2018 18:07:11 -0500 + +byobu (5.126-0ubuntu1) cosmic; urgency=medium + + [ Dustin Kirkland ] + * usr/lib/byobu/include/constants, usr/share/byobu/keybindings/f- + keys.screen, usr/share/byobu/keybindings/f-keys.tmux: + - create a $BYOBU_EDITOR variable, using "sensible-editor" if found + (it will be on Debian/Ubuntu systems), or $EDITOR if not, and falling + back to "vim" in the case where none are found + - use $BYOBU_EDITOR with Shift-F7 to open the printscreen buffer in + a new window; this fixes a bug on some distros where $EDITOR might + be undefined + * usr/lib/byobu/session: + - don't count sessions that start with _ + - BUG: #892489 + * usr/lib/byobu/include/shutil, usr/lib/byobu/logo: + - add a logo for gLinux + + [ Mark Kelly ] + * usr/lib/byobu/updates_available: + - Fix rare race condition for update_needed and cache file (#26) + - https://github.com/dustinkirkland/byobu/pull/26 + + [ Didier Roche ] + * byobu.desktop: + - give some hints for GNOME Shell to correctly match byobu desktop file + (LP: #1718482); partial fix, not entirely working yet + + -- Dustin Kirkland <kirkl...@ubuntu.com> Sun, 27 May 2018 18:07:09 -0500 + +byobu (5.125-0ubuntu1) bionic; urgency=medium [ Jean-Baptiste Lallement ] * usr/share/byobu/profiles/dircolors: LP: #1752352 @@ -15,7 +101,7 @@ * debian/control: - need sensible-utils - -- Dustin Kirkland <kirkl...@ubuntu.com> Mon, 04 Dec 2017 07:46:48 -0600 + -- Dustin Kirkland <kirkl...@ubuntu.com> Fri, 16 Mar 2018 10:09:55 -0700 byobu (5.124-0ubuntu1) bionic; urgency=medium diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/bin/byobu-janitor.in new/byobu-5.127/usr/bin/byobu-janitor.in --- old/byobu-5.125/usr/bin/byobu-janitor.in 2016-09-15 21:22:48.000000000 +0200 +++ new/byobu-5.127/usr/bin/byobu-janitor.in 2018-08-12 16:01:44.000000000 +0200 @@ -125,4 +125,7 @@ fi [ -r "$BYOBU_CONFIG_DIR/prompt" ] || printf "[ -r ${BYOBU_PREFIX}/share/${PKG}/profiles/bashrc ] && . ${BYOBU_PREFIX}/share/${PKG}/profiles/bashrc #byobu-prompt#\n" > "$BYOBU_CONFIG_DIR/prompt" +# Affects: Upgrades from <= byobu 5.126, clear out ec2/rcs cost statuses +rm -f "$BYOBU_RUN_DIR"/cache.tmux/ec2_cost* "$BYOBU_RUN_DIR"/cache.tmux/rcs_cost* "$BYOBU_RUN_DIR"/status.tmux/ec2_cost* "$BYOBU_RUN_DIR"/status.tmux/rcs_cost* + # vi: syntax=sh ts=4 noexpandtab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/bin/byobu-select-profile.in new/byobu-5.127/usr/bin/byobu-select-profile.in --- old/byobu-5.125/usr/bin/byobu-select-profile.in 2016-09-15 21:22:48.000000000 +0200 +++ new/byobu-5.127/usr/bin/byobu-select-profile.in 2018-08-12 16:41:24.000000000 +0200 @@ -59,13 +59,14 @@ usage () { cat <<EOT -Usage: $0 [(-l|--list)][(-h|--help)] - -l,--list list available profiles - -b,--background set the background color - -f,--foreground set the foreground color - -h,--help this help - - Without any parameters, runs interactively. +Usage: $0 [OPTION] + -l,--list list available profiles + -b,--background COLOR set the background color + -f,--foreground COLOR set the foreground color + -h,--hostnmae set the colors based on a hash of the hostname + -i,--ip set the colors based on a hash of the ip + -r,--random set the colors randomly + --help this help EOT } @@ -83,60 +84,6 @@ done } -prompt() { - which="$1" - count=1 - selected=-1 - while /bin/true; do - if [ $count -gt 5 ]; then - echo `gettext "ERROR: Invalid selection"` - exit 1 - fi - count=$(expr $count + 1) - echo - if [ "$which" = "foreground" ]; then - echo `gettext 'Select the foreground color: '` - simple="white" - else - echo `gettext 'Select the background color: '` - simple="black" - fi - i=1 - for x in $COLORS; do - test $i -lt 10 2>/dev/null && printf " " || printf " " - echo "$i. $x" - i=$(expr $i + 1) - [ "$simple" = "$x" ] && simple=$i - done - echo - if [ -z "$selected" -a -n "$simple" ]; then - selected="$simple" - elif ! test $selected -gt 0 2>/dev/null; then - printf "`gettext 'Choose'` 1-$i [$simple]: " - selected=`head -n1` - elif ! test $selected -le $i 2>/dev/null; then - printf "`gettext 'Choose'` 1-$i [$simple]: " - selected=`head -n1` - else - i=1 - for color in $COLORS; do - [ "$i" = "$selected" ] && break - i=$(expr $i + 1) - done - echo `gettext "Selected"` "$which [$color]" - case "$BYOBU_BACKEND" in - screen) - setcolor_screen "$which" "$color" - ;; - tmux|*) - setcolor_tmux "$color" - ;; - esac - return 0 - fi - done -} - getletter() { count=$(echo "$1" | wc -c) if [ "$count" = "2" ]; then @@ -214,12 +161,7 @@ } if [ $# -eq 0 ]; then - prompt "background" - case "$BYOBU_BACKEND" in - screen) - prompt "foreground" - ;; - esac + usage else while true; do case "$1" in @@ -231,11 +173,6 @@ setcolor_screen "foreground" "$2" shift 2 ;; - -l|--list) - listprofiles - shift - break - ;; -h|--hostname) color=$(hostname | $HASH | head -c 6) setcolor_tmux "$color" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/bin/byobu-shell.in new/byobu-5.127/usr/bin/byobu-shell.in --- old/byobu-5.125/usr/bin/byobu-shell.in 2016-04-08 00:05:52.000000000 +0200 +++ new/byobu-5.127/usr/bin/byobu-shell.in 2018-08-12 17:24:20.000000000 +0200 @@ -36,7 +36,7 @@ echo " 'byobu-disable' and 'byobu-enable'" echo echo "For tips, tricks, and more information, see:" - echo " * http://bit.ly/byobu-help"; + echo " * https://bit.ly/byobu-tips"; echo touch "$FLAG" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/bin/byobu.in new/byobu-5.127/usr/bin/byobu.in --- old/byobu-5.125/usr/bin/byobu.in 2017-12-04 14:46:48.000000000 +0100 +++ new/byobu-5.127/usr/bin/byobu.in 2018-08-12 17:40:31.000000000 +0200 @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION=5.125 +VERSION=5.127 PKG="byobu" # All sorts of things go wrong if you don't own your $HOME dir. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/Makefile.am new/byobu-5.127/usr/lib/byobu/Makefile.am --- old/byobu-5.125/usr/lib/byobu/Makefile.am 2013-12-03 19:02:14.000000000 +0100 +++ new/byobu-5.127/usr/lib/byobu/Makefile.am 2018-08-12 15:53:44.000000000 +0200 @@ -1,3 +1,3 @@ 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 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/Makefile.in new/byobu-5.127/usr/lib/byobu/Makefile.in --- old/byobu-5.125/usr/lib/byobu/Makefile.in 2018-03-16 17:28:28.000000000 +0100 +++ new/byobu-5.127/usr/lib/byobu/Makefile.in 2018-08-12 18:35:59.000000000 +0200 @@ -222,7 +222,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ 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 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 all: all-am .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/ec2_cost new/byobu-5.127/usr/lib/byobu/ec2_cost --- old/byobu-5.125/usr/lib/byobu/ec2_cost 2016-04-08 00:05:52.000000000 +0200 +++ new/byobu-5.127/usr/lib/byobu/ec2_cost 1970-01-01 01:00:00.000000000 +0100 @@ -1,107 +0,0 @@ -#!/bin/sh -e -# -# ec2_cost: approximate EC2 cost (USD) of the current instance -# -# Copyright (C) 2008 Canonical Ltd. -# Copyright (C) 2011-2014 Dustin Kirkland -# -# Authors: Dustin Kirkland <kirkl...@byobu.org> -# -# 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/>. - -# Data Transfer Cost Basis -# Incoming $0.01/GB -# Outgoing $0.12/GB -# (This gets more complex if you use >10TB/mo) -RX_RATE="0.01" -TX_RATE="0.12" - -__ec2_cost_detail() { - DETAIL=1 - __ec2_cost -} - -__ec2_cost() { - local zone type file_to_stat cpu mem rate hours tx_gb rx_gb network_cost uptime_cost total_cost interface cache="$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND/ec2_cost" - if [ -s "$cache.rate" ]; then - read rate < "$cache.rate" - elif metadata_available; then - # Try to use metadata service - [ -s "$cache.zone" ] || timeout 0.2 wget -q -O- http://169.254.169.254/latest/meta-data/placement/availability-zone </dev/null >"$cache.zone" 2>/dev/null & - sleep 0.02 - [ -s "$cache.zone" ] && read zone < "$cache.zone" - zone=${zone%%[a-z]} - [ -s "$cache.type" ] || timeout 0.2 wget -q -O- http://169.254.169.254/latest/meta-data/instance-type </dev/null >"$cache.type" 2>/dev/null & - sleep 0.02 - [ -s "$cache.type" ] && read type < "$cache.type" - $BYOBU_PREFIX/lib/byobu/include/ec2instancespricing.py --type ondemand --filter-region $zone --filter-type $type --filter-os-type linux --format csv | tail -n1 > "$cache.rate" - read rate < "$cache.rate" - fi - if [ -z "$rate" ]; then - # Unknown rate, exit immediately - # Rate estimation is now deprecated - return - fi - rate=${rate##*,} - file_to_stat="/etc/hostname" - hours=$(((`date +%s` - `stat --printf %Y $file_to_stat`) / 60 / 60 + 1)) - # Auto detect network interface - [ -r "/proc/net/route" ] || return - interface=$(tail -n1 /proc/net/route | awk '{print $1}') - local iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed - while read iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed; do - case "$iface" in - ${interface}:) - tx_gb=${tbytes} - rx_gb=${rbytes} - break; - ;; - ${interface}:*) - # Interface and rbytes got munged together - tx_gb=${rmulticast##*:} - rx_gb=${iface##*:} - break; - ;; - esac - if [ "$iface" = "${interface}:" ]; then - tx_gb=${tbytes} - rx_gb=${rbytes} - break - fi - done < /proc/net/dev - tx_gb=$(printf "%s" ${tx_gb} | awk '{ printf "%f", $1 / 1024 / 1024 / 1024 }') - rx_gb=$(printf "%s" ${rx_gb} | awk '{ printf "%f", $1 / 1024 / 1024 / 1024 }') - network_cost=`printf "%s %s %s %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 - uptime_cost=`printf "%s" "$hours" | awk "{printf \"%f\", "$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 Amazon's EC2 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 @ \$$rate/hr" - echo " Uptime cost: \$$uptime_cost" - echo "------------------------------------------------" - echo "Total cost: ~\$$total_cost" - echo "================================================" - return - fi - [ -n "$total_cost" ] || return - color K G; printf "A\$"; color -; color b K G; printf "%s" "$total_cost"; color -- -} - -# vi: syntax=sh ts=4 noexpandtab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/include/Makefile.am new/byobu-5.127/usr/lib/byobu/include/Makefile.am --- old/byobu-5.125/usr/lib/byobu/include/Makefile.am 2016-07-05 17:37:45.000000000 +0200 +++ new/byobu-5.127/usr/lib/byobu/include/Makefile.am 2018-08-12 15:54:59.000000000 +0200 @@ -1,2 +1,2 @@ inclibdirdir = $(prefix)/lib/@PACKAGE@/include -inclibdir_SCRIPTS = common colors config.py constants cycle-status dirs icons mondrian notify_osd shutil ec2instancespricing.py select-session.py tmux-detach-all-but-current-client tmux-send-command-to-all-panes tmux-send-command-to-all-windows toggle-utf8 +inclibdir_SCRIPTS = common colors config.py constants cycle-status dirs icons mondrian notify_osd shutil select-session.py tmux-detach-all-but-current-client tmux-send-command-to-all-panes tmux-send-command-to-all-windows toggle-utf8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/include/Makefile.in new/byobu-5.127/usr/lib/byobu/include/Makefile.in --- old/byobu-5.125/usr/lib/byobu/include/Makefile.in 2018-03-16 17:28:28.000000000 +0100 +++ new/byobu-5.127/usr/lib/byobu/include/Makefile.in 2018-08-12 18:35:59.000000000 +0200 @@ -223,7 +223,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ inclibdirdir = $(prefix)/lib/@PACKAGE@/include -inclibdir_SCRIPTS = common colors config.py constants cycle-status dirs icons mondrian notify_osd shutil ec2instancespricing.py select-session.py tmux-detach-all-but-current-client tmux-send-command-to-all-panes tmux-send-command-to-all-windows toggle-utf8 +inclibdir_SCRIPTS = common colors config.py constants cycle-status dirs icons mondrian notify_osd shutil select-session.py tmux-detach-all-but-current-client tmux-send-command-to-all-panes tmux-send-command-to-all-windows toggle-utf8 all: all-am .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/include/config.py.in new/byobu-5.127/usr/lib/byobu/include/config.py.in --- old/byobu-5.125/usr/lib/byobu/include/config.py.in 2017-08-17 23:53:22.000000000 +0200 +++ new/byobu-5.127/usr/lib/byobu/include/config.py.in 2018-08-12 18:17:32.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # config.py # Copyright (C) 2008 Canonical Ltd. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/include/constants new/byobu-5.127/usr/lib/byobu/include/constants --- old/byobu-5.125/usr/lib/byobu/include/constants 2016-09-15 21:22:48.000000000 +0200 +++ new/byobu-5.127/usr/lib/byobu/include/constants 2018-05-27 21:30:52.000000000 +0200 @@ -47,6 +47,9 @@ eval $BYOBU_TEST gsed >/dev/null 2>&1 && export BYOBU_SED="gsed" || export BYOBU_SED="sed" eval $BYOBU_TEST greadlink >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink" eval $BYOBU_TEST sensible-pager >/dev/null 2>&1 && export BYOBU_PAGER="sensible-pager" || export BYOBU_PAGER="less" +eval $BYOBU_TEST sensible-editor >/dev/null 2>&1 && export BYOBU_EDITOR="sensible-editor" || export BYOBU_EDITOR="$EDITOR" +eval $BYOBU_TEST "$BYOBU_EDITOR" >/dev/null 2>&1 || export BYOBU_EDITOR="vim" + # Check sed's follow-symlinks feature $BYOBU_SED --follow-symlinks "s///" /dev/null 2>/dev/null && BYOBU_SED_INLINE="$BYOBU_SED -i --follow-symlinks" || BYOBU_SED_INLINE="$BYOBU_SED -i" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/include/ec2instancespricing.py new/byobu-5.127/usr/lib/byobu/include/ec2instancespricing.py --- old/byobu-5.125/usr/lib/byobu/include/ec2instancespricing.py 2015-11-16 04:11:27.000000000 +0100 +++ new/byobu-5.127/usr/lib/byobu/include/ec2instancespricing.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,582 +0,0 @@ -#!/usr/bin/python -# -# Copyright (c) 2012 Eran Sandler (e...@sandler.co.il), http://eran.sandler.co.il, http://forecastcloudy.net -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -from __future__ import print_function -from future import standard_library -standard_library.install_aliases() -from builtins import object -import urllib.request, urllib.error, urllib.parse -import argparse -import datetime -try: - import simplejson as json -except ImportError: - import json - -EC2_REGIONS = [ - "us-east-1", - "us-west-1", - "us-west-2", - "eu-west-1", - "ap-southeast-1", - "ap-southeast-2", - "ap-northeast-1", - "sa-east-1" -] - -EC2_INSTANCE_TYPES = [ - "t1.micro", - "m1.small", - "m1.medium", - "m1.large", - "m1.xlarge", - "m2.xlarge", - "m2.2xlarge", - "m2.4xlarge", - "c1.medium", - "c1.xlarge", - "cc1.4xlarge", - "cc2.8xlarge", - "cg1.4xlarge", - "cr1.8xlarge", - "m3.xlarge", - "m3.2xlarge", - "hi1.4xlarge", - "hs1.8xlarge", - "g2.2xlarge" -] - -EC2_OS_TYPES = [ - "linux", # api platform name = "linux" - "mswin", # api platform name = "windows" - "rhel", # api platform name = "" - "sles", # api platform name = "" - "mswinSQL", # api platform name = "windows" - "mswinSQLWeb", # api platform name = "windows" -] - -JSON_NAME_TO_EC2_REGIONS_API = { - "us-east" : "us-east-1", - "us-east-1" : "us-east-1", - "us-west" : "us-west-1", - "us-west-1" : "us-west-1", - "us-west-2" : "us-west-2", - "eu-ireland" : "eu-west-1", - "eu-west-1" : "eu-west-1", - "apac-sin" : "ap-southeast-1", - "ap-southeast-1" : "ap-southeast-1", - "ap-southeast-2" : "ap-southeast-2", - "apac-syd" : "ap-southeast-2", - "apac-tokyo" : "ap-northeast-1", - "ap-northeast-1" : "ap-northeast-1", - "sa-east-1" : "sa-east-1" -} - -EC2_REGIONS_API_TO_JSON_NAME = { - "us-east-1" : "us-east", - "us-west-1" : "us-west", - "us-west-2" : "us-west-2", - "eu-west-1" : "eu-ireland", - "ap-southeast-1" : "apac-sin", - "ap-southeast-2" : "apac-syd", - "ap-northeast-1" : "apac-tokyo", - "sa-east-1" : "sa-east-1" -} - -INSTANCES_ON_DEMAND_LINUX_URL = "http://aws.amazon.com/ec2/pricing/json/linux-od.json"; -INSTANCES_ON_DEMAND_RHEL_URL = "http://aws.amazon.com/ec2/pricing/json/rhel-od.json"; -INSTANCES_ON_DEMAND_SLES_URL = "http://aws.amazon.com/ec2/pricing/json/sles-od.json"; -INSTANCES_ON_DEMAND_WINDOWS_URL = "http://aws.amazon.com/ec2/pricing/json/mswin-od.json"; -INSTANCES_ON_DEMAND_WINSQL_URL = "http://aws.amazon.com/ec2/pricing/json/mswinSQL-od.json"; -INSTANCES_ON_DEMAND_WINSQLWEB_URL = "http://aws.amazon.com/ec2/pricing/json/mswinSQLWeb-od.json"; -INSTANCES_RESERVED_LIGHT_UTILIZATION_LINUX_URL = "http://aws.amazon.com/ec2/pricing/json/linux-ri-light.json"; -INSTANCES_RESERVED_LIGHT_UTILIZATION_RHEL_URL = "http://aws.amazon.com/ec2/pricing/json/rhel-ri-light.json"; -INSTANCES_RESERVED_LIGHT_UTILIZATION_SLES_URL = "http://aws.amazon.com/ec2/pricing/json/sles-ri-light.json"; -INSTANCES_RESERVED_LIGHT_UTILIZATION_WINDOWS_URL = "http://aws.amazon.com/ec2/pricing/json/mswin-ri-light.json"; -INSTANCES_RESERVED_LIGHT_UTILIZATION_WINSQL_URL = "http://aws.amazon.com/ec2/pricing/json/mswinSQL-ri-light.json"; -INSTANCES_RESERVED_LIGHT_UTILIZATION_WINSQLWEB_URL = "http://aws.amazon.com/ec2/pricing/json/mswinSQLWeb-ri-light.json"; -INSTANCES_RESERVED_MEDIUM_UTILIZATION_LINUX_URL = "http://aws.amazon.com/ec2/pricing/json/linux-ri-medium.json"; -INSTANCES_RESERVED_MEDIUM_UTILIZATION_RHEL_URL = "http://aws.amazon.com/ec2/pricing/json/rhel-ri-medium.json"; -INSTANCES_RESERVED_MEDIUM_UTILIZATION_SLES_URL = "http://aws.amazon.com/ec2/pricing/json/sles-ri-medium.json"; -INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINDOWS_URL = "http://aws.amazon.com/ec2/pricing/json/mswin-ri-medium.json"; -INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINSQL_URL = "http://aws.amazon.com/ec2/pricing/json/mswinSQL-ri-medium.json"; -INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINSQLWEB_URL = "http://aws.amazon.com/ec2/pricing/json/mswinSQLWeb-ri-medium.json"; -INSTANCES_RESERVED_HEAVY_UTILIZATION_LINUX_URL = "http://aws.amazon.com/ec2/pricing/json/linux-ri-heavy.json"; -INSTANCES_RESERVED_HEAVY_UTILIZATION_RHEL_URL = "http://aws.amazon.com/ec2/pricing/json/rhel-ri-heavy.json"; -INSTANCES_RESERVED_HEAVY_UTILIZATION_SLES_URL = "http://aws.amazon.com/ec2/pricing/json/sles-ri-heavy.json"; -INSTANCES_RESERVED_HEAVY_UTILIZATION_WINDOWS_URL = "http://aws.amazon.com/ec2/pricing/json/mswin-ri-heavy.json"; -INSTANCES_RESERVED_HEAVY_UTILIZATION_WINSQL_URL = "http://aws.amazon.com/ec2/pricing/json/mswinSQL-ri-heavy.json"; -INSTANCES_RESERVED_HEAVY_UTILIZATION_WINSQLWEB_URL = "http://aws.amazon.com/ec2/pricing/json/mswinSQLWeb-ri-heavy.json"; - -INSTANCES_ONDEMAND_OS_TYPE_BY_URL = { - INSTANCES_ON_DEMAND_LINUX_URL : "linux", - INSTANCES_ON_DEMAND_RHEL_URL : "rhel", - INSTANCES_ON_DEMAND_SLES_URL : "sles", - INSTANCES_ON_DEMAND_WINDOWS_URL : "mswin", - INSTANCES_ON_DEMAND_WINSQL_URL : "mswinSQL", - INSTANCES_ON_DEMAND_WINSQLWEB_URL : "mswinSQLWeb", -} - -INSTANCES_RESERVED_OS_TYPE_BY_URL = { - INSTANCES_RESERVED_LIGHT_UTILIZATION_LINUX_URL : "linux", - INSTANCES_RESERVED_LIGHT_UTILIZATION_RHEL_URL : "rhel", - INSTANCES_RESERVED_LIGHT_UTILIZATION_SLES_URL : "sles", - INSTANCES_RESERVED_LIGHT_UTILIZATION_WINDOWS_URL : "mswin", - INSTANCES_RESERVED_LIGHT_UTILIZATION_WINSQL_URL : "mswinSQL", - INSTANCES_RESERVED_LIGHT_UTILIZATION_WINSQLWEB_URL : "mswinSQLWeb", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_LINUX_URL : "linux", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_RHEL_URL : "rhel", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_SLES_URL : "sles", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINDOWS_URL : "mswin", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINSQL_URL : "mswinSQL", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINSQLWEB_URL : "mswinSQLWeb", - INSTANCES_RESERVED_HEAVY_UTILIZATION_LINUX_URL : "linux", - INSTANCES_RESERVED_HEAVY_UTILIZATION_RHEL_URL : "rhel", - INSTANCES_RESERVED_HEAVY_UTILIZATION_SLES_URL : "sles", - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINDOWS_URL : "mswin", - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINSQL_URL : "mswinSQL", - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINSQLWEB_URL : "mswinSQLWeb", -} - -INSTANCES_RESERVED_UTILIZATION_TYPE_BY_URL = { - INSTANCES_RESERVED_LIGHT_UTILIZATION_LINUX_URL : "light", - INSTANCES_RESERVED_LIGHT_UTILIZATION_RHEL_URL : "light", - INSTANCES_RESERVED_LIGHT_UTILIZATION_SLES_URL : "light", - INSTANCES_RESERVED_LIGHT_UTILIZATION_WINDOWS_URL : "light", - INSTANCES_RESERVED_LIGHT_UTILIZATION_WINSQL_URL : "light", - INSTANCES_RESERVED_LIGHT_UTILIZATION_WINSQLWEB_URL : "light", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_LINUX_URL : "medium", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_RHEL_URL : "medium", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_SLES_URL : "medium", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINDOWS_URL : "medium", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINSQL_URL : "medium", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINSQLWEB_URL : "medium", - INSTANCES_RESERVED_HEAVY_UTILIZATION_LINUX_URL : "heavy", - INSTANCES_RESERVED_HEAVY_UTILIZATION_RHEL_URL : "heavy", - INSTANCES_RESERVED_HEAVY_UTILIZATION_SLES_URL : "heavy", - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINDOWS_URL : "heavy", - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINSQL_URL : "heavy", - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINSQLWEB_URL : "heavy", -} - -DEFAULT_CURRENCY = "USD" - -INSTANCE_TYPE_MAPPING = { - "stdODI" : "m1", - "uODI" : "t1", - "hiMemODI" : "m2", - "hiCPUODI" : "c1", - "clusterComputeI" : "cc1", - "clusterGPUI" : "cg1", - "hiIoODI" : "hi1", - "secgenstdODI" : "m3", - "hiStoreODI": "hs1", - "clusterHiMemODI": "cr1", - - # Reserved Instance Types - "stdResI" : "m1", - "uResI" : "t1", - "hiMemResI" : "m2", - "hiCPUResI" : "c1", - "clusterCompResI" : "cc1", - "clusterGPUResI" : "cg1", - "hiIoResI" : "hi1", - "secgenstdResI" : "m3", - "hiStoreResI": "hs1", - "clusterHiMemResI": "cr1" -} - -INSTANCE_SIZE_MAPPING = { - "u" : "micro", - "sm" : "small", - "med" : "medium", - "lg" : "large", - "xl" : "xlarge", - "xxl" : "2xlarge", - "xxxxl" : "4xlarge", - "xxxxxxxxl" : "8xlarge" -} - -class ResultsCacheBase(object): - _instance = None - - def __new__(cls, *args, **kwargs): - if not cls._instance: - cls._instance = super(ResultsCacheBase, cls).__new__(cls, *args, **kwargs) - - return cls._instance - - def get(self, key): - pass - - def set(self, key, value): - pass - - -class SimpleResultsCache(ResultsCacheBase): - _cache = {} - - def get(self, key): - if key in self._cache: - return self._cache[key] - - return None - - def set(self, key, value): - self._cache[key] = value - - -class TimeBasedResultsCache(ResultsCacheBase): - _cache = {} - _cache_expiration = {} - - # If you wish to chance this expiration use the following (a bit ugly) code: - # - # TimeBasedResultsCache()._default_expiration_in_seconds = 86400 # 1 day - # - # Since all cache classes inherit from ResultsCacheBase and are singletons that should set it correctly. - # - _default_expiration_in_seconds = 3600 # 1 hour - - def get(self, key): - if key not in self._cache or key not in self._cache_expiration: - return None - - # If key has expired return None - if self._cache_expiration[key] < datetime.datetime.utcnow(): - if key in self._cache: del self._cache[key] - if key in self._cache_expiration: del self._cache_expiration[key] - - return None - - return self._cache[key] - - def set(self, key, value): - self._cache[key] = value - self._cache_expiration[key] = datetime.datetime.utcnow() + datetime.timedelta(seconds=self._default_expiration_in_seconds) - - -def _load_data(url, use_cache=False, cache_class=SimpleResultsCache): - cache_object = None - if use_cache: - cache_object = cache_class() - result = cache_object.get(url) - if result is not None: - return result - - f = urllib.request.urlopen(url) - result = json.loads(f.read()) - - if use_cache: - cache_object.set(url, result) - - return result - -def get_ec2_reserved_instances_prices(filter_region=None, filter_instance_type=None, filter_os_type=None, use_cache=False, cache_class=SimpleResultsCache): - """ Get EC2 reserved instances prices. Results can be filtered by region """ - - get_specific_region = (filter_region is not None) - if get_specific_region: - filter_region = EC2_REGIONS_API_TO_JSON_NAME[filter_region] - get_specific_instance_type = (filter_instance_type is not None) - get_specific_os_type = (filter_os_type is not None) - - currency = DEFAULT_CURRENCY - - urls = [ - INSTANCES_RESERVED_LIGHT_UTILIZATION_LINUX_URL, - INSTANCES_RESERVED_LIGHT_UTILIZATION_RHEL_URL, - INSTANCES_RESERVED_LIGHT_UTILIZATION_SLES_URL, - INSTANCES_RESERVED_LIGHT_UTILIZATION_WINDOWS_URL, - INSTANCES_RESERVED_LIGHT_UTILIZATION_WINSQL_URL, - INSTANCES_RESERVED_LIGHT_UTILIZATION_WINSQLWEB_URL, - INSTANCES_RESERVED_MEDIUM_UTILIZATION_LINUX_URL, - INSTANCES_RESERVED_MEDIUM_UTILIZATION_RHEL_URL, - INSTANCES_RESERVED_MEDIUM_UTILIZATION_SLES_URL, - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINDOWS_URL, - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINSQL_URL, - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINSQLWEB_URL, - INSTANCES_RESERVED_HEAVY_UTILIZATION_LINUX_URL, - INSTANCES_RESERVED_HEAVY_UTILIZATION_RHEL_URL, - INSTANCES_RESERVED_HEAVY_UTILIZATION_SLES_URL, - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINDOWS_URL, - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINSQL_URL, - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINSQLWEB_URL, - ] - - result_regions = [] - result_regions_index = {} - result = { - "config" : { - "currency" : currency, - }, - "regions" : result_regions - } - - for u in urls: - os_type = INSTANCES_RESERVED_OS_TYPE_BY_URL[u] - if get_specific_os_type and os_type != filter_os_type: - continue - utilization_type = INSTANCES_RESERVED_UTILIZATION_TYPE_BY_URL[u] - data = _load_data(u, use_cache=use_cache, cache_class=cache_class) - if "config" in data and data["config"] and "regions" in data["config"] and data["config"]["regions"]: - for r in data["config"]["regions"]: - if "region" in r and r["region"]: - if get_specific_region and filter_region != r["region"]: - continue - - region_name = JSON_NAME_TO_EC2_REGIONS_API[r["region"]] - if region_name in result_regions_index: - instance_types = result_regions_index[region_name]["instanceTypes"] - else: - instance_types = [] - result_regions.append({ - "region" : region_name, - "instanceTypes" : instance_types - }) - result_regions_index[region_name] = result_regions[-1] - - if "instanceTypes" in r: - for it in r["instanceTypes"]: - instance_type = it["type"] - if "sizes" in it: - for s in it["sizes"]: - instance_size = s["size"] - - prices = { - "1year" : { - "hourly" : None, - "upfront" : None - }, - "3year" : { - "hourly" : None, - "upfront" : None - } - } - - _type = instance_size - if _type == "cc1.8xlarge": - # Fix conflict where cc1 and cc2 share the same type - _type = "cc2.8xlarge" - - if get_specific_instance_type and _type != filter_instance_type: - continue - - if get_specific_os_type and os_type != filter_os_type: - continue - - instance_types.append({ - "type" : _type, - "os" : os_type, - "utilization" : utilization_type, - "prices" : prices - }) - - for price_data in s["valueColumns"]: - price = None - try: - price = float(price_data["prices"][currency]) - except ValueError: - price = None - - if price_data["name"] == "yrTerm1": - prices["1year"]["upfront"] = price - elif price_data["name"] == "yrTerm1Hourly": - prices["1year"]["hourly"] = price - elif price_data["name"] == "yrTerm3": - prices["3year"]["upfront"] = price - elif price_data["name"] == "yrTerm3Hourly": - prices["3year"]["hourly"] = price - - return result - -def get_ec2_ondemand_instances_prices(filter_region=None, filter_instance_type=None, filter_os_type=None, use_cache=False, cache_class=SimpleResultsCache): - """ Get EC2 on-demand instances prices. Results can be filtered by region """ - - get_specific_region = (filter_region is not None) - if get_specific_region: - filter_region = EC2_REGIONS_API_TO_JSON_NAME[filter_region] - - get_specific_instance_type = (filter_instance_type is not None) - get_specific_os_type = (filter_os_type is not None) - - currency = DEFAULT_CURRENCY - - urls = [ - INSTANCES_ON_DEMAND_LINUX_URL, - INSTANCES_ON_DEMAND_RHEL_URL, - INSTANCES_ON_DEMAND_SLES_URL, - INSTANCES_ON_DEMAND_WINDOWS_URL, - INSTANCES_ON_DEMAND_WINSQL_URL, - INSTANCES_ON_DEMAND_WINSQLWEB_URL - ] - - result_regions = [] - result = { - "config" : { - "currency" : currency, - "unit" : "perhr" - }, - "regions" : result_regions - } - - for u in urls: - if get_specific_os_type and INSTANCES_ONDEMAND_OS_TYPE_BY_URL[u] != filter_os_type: - continue - - data = _load_data(u, use_cache=use_cache, cache_class=cache_class) - if "config" in data and data["config"] and "regions" in data["config"] and data["config"]["regions"]: - for r in data["config"]["regions"]: - if "region" in r and r["region"]: - if get_specific_region and filter_region != r["region"]: - continue - - region_name = JSON_NAME_TO_EC2_REGIONS_API[r["region"]] - instance_types = [] - if "instanceTypes" in r: - for it in r["instanceTypes"]: - instance_type = it["type"] - if "sizes" in it: - for s in it["sizes"]: - instance_size = s["size"] - - for price_data in s["valueColumns"]: - price = None - try: - price = float(price_data["prices"][currency]) - except ValueError: - price = None - - _type = instance_size - if _type == "cc1.8xlarge": - # Fix conflict where cc1 and cc2 share the same type - _type = "cc2.8xlarge" - - if get_specific_instance_type and _type != filter_instance_type: - continue - - if get_specific_os_type and price_data["name"] != filter_os_type: - continue - - instance_types.append({ - "type" : _type, - "os" : price_data["name"], - "price" : price - }) - - result_regions.append({ - "region" : region_name, - "instanceTypes" : instance_types - }) - - return result - - -if __name__ == "__main__": - def none_as_string(v): - if not v: - return "" - else: - return v - - try: - import argparse - except ImportError: - print("ERROR: You are running Python < 2.7. Please use pip to install argparse: pip install argparse") - - - parser = argparse.ArgumentParser(add_help=True, description="Print out the current prices of EC2 instances") - parser.add_argument("--type", "-t", help="Show ondemand or reserved instances", choices=["ondemand", "reserved"], required=True) - parser.add_argument("--filter-region", "-fr", help="Filter results to a specific region", choices=EC2_REGIONS, default=None) - parser.add_argument("--filter-type", "-ft", help="Filter results to a specific instance type", choices=EC2_INSTANCE_TYPES, default=None) - parser.add_argument("--filter-os-type", "-fo", help="Filter results to a specific os type", choices=EC2_OS_TYPES, default=None) - parser.add_argument("--format", "-f", choices=["json", "table", "csv"], help="Output format", default="table") - - args = parser.parse_args() - - if args.format == "table": - try: - from prettytable import PrettyTable - except ImportError: - print("ERROR: Please install 'prettytable' using pip: pip install prettytable") - - data = None - if args.type == "ondemand": - data = get_ec2_ondemand_instances_prices(args.filter_region, args.filter_type, args.filter_os_type) - elif args.type == "reserved": - data = get_ec2_reserved_instances_prices(args.filter_region, args.filter_type, args.filter_os_type) - - if args.format == "json": - print(json.dumps(data)) - elif args.format == "table": - x = PrettyTable() - - if args.type == "ondemand": - try: - x.set_field_names(["region", "type", "os", "price"]) - except AttributeError: - x.field_names = ["region", "type", "os", "price"] - - try: - x.aligns[-1] = "l" - except AttributeError: - x.align["price"] = "l" - - for r in data["regions"]: - region_name = r["region"] - for it in r["instanceTypes"]: - x.add_row([region_name, it["type"], it["os"], none_as_string(it["price"])]) - elif args.type == "reserved": - try: - x.set_field_names(["region", "type", "os", "utilization", "term", "price", "upfront"]) - except AttributeError: - x.field_names = ["region", "type", "os", "utilization", "term", "price", "upfront"] - - try: - x.aligns[-1] = "l" - x.aligns[-2] = "l" - except AttributeError: - x.align["price"] = "l" - x.align["upfront"] = "l" - - for r in data["regions"]: - region_name = r["region"] - for it in r["instanceTypes"]: - for term in it["prices"]: - x.add_row([region_name, it["type"], it["os"], it["utilization"], term, none_as_string(it["prices"][term]["hourly"]), none_as_string(it["prices"][term]["upfront"])]) - - print(x) - elif args.format == "csv": - if args.type == "ondemand": - print("region,type,os,price") - for r in data["regions"]: - region_name = r["region"] - for it in r["instanceTypes"]: - print("%s,%s,%s,%s" % (region_name, it["type"], it["os"], none_as_string(it["price"]))) - elif args.type == "reserved": - print("region,type,os,utilization,term,price,upfront") - for r in data["regions"]: - region_name = r["region"] - for it in r["instanceTypes"]: - for term in it["prices"]: - print("%s,%s,%s,%s,%s,%s,%s" % (region_name, it["type"], it["os"], it["utilization"], term, none_as_string(it["prices"][term]["hourly"]), none_as_string(it["prices"][term]["upfront"]))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/include/select-session.py new/byobu-5.127/usr/lib/byobu/include/select-session.py --- old/byobu-5.125/usr/lib/byobu/include/select-session.py 2018-03-15 22:26:45.000000000 +0100 +++ new/byobu-5.127/usr/lib/byobu/include/select-session.py 2018-08-12 18:17:29.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # select-session.py # Copyright (C) 2010 Canonical Ltd. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/include/shutil new/byobu-5.127/usr/lib/byobu/include/shutil --- old/byobu-5.125/usr/lib/byobu/include/shutil 2017-06-02 15:28:30.000000000 +0200 +++ new/byobu-5.127/usr/lib/byobu/include/shutil 2018-08-12 18:26:49.000000000 +0200 @@ -247,7 +247,6 @@ disk) _RET=13 ;; disk_io) _RET=3 ;; distro) _RET=9999991 ;; - ec2_cost) _RET=601 ;; entropy) _RET=5 ;; fan_speed) _RET=23 ;; hostname) _RET=607 ;; @@ -261,7 +260,6 @@ notify_osd) _RET=9999991 ;; processes) _RET=7 ;; raid) _RET=59 ;; - rcs_cost) _RET=613 ;; reboot_required) _RET=5 ;; release) _RET=599 ;; services) _RET=53 ;; @@ -318,6 +316,11 @@ true elif [ -r "/etc/os-release" ]; then distro=$(. /etc/os-release && echo "$NAME") + case "$distro" in + Debian*) + [ -r /etc/lsb-release ] && distro=$(. /etc/lsb-release && [ -n "$GOOGLE_ID" ] && echo "gLinux" || echo "Debian") + ;; + esac elif [ -r "/etc/issue" ]; then # lsb_release is *really* slow; try to use /etc/issue first local issue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/include/toggle-utf8.in new/byobu-5.127/usr/lib/byobu/include/toggle-utf8.in --- old/byobu-5.125/usr/lib/byobu/include/toggle-utf8.in 2016-04-08 00:05:52.000000000 +0200 +++ new/byobu-5.127/usr/lib/byobu/include/toggle-utf8.in 2018-08-12 17:09:35.000000000 +0200 @@ -39,7 +39,8 @@ export BYOBU_CHARMAP=UTF-8 fi if [ -n "$TMUX" ]; then - tmux send-keys " export BYOBU_CHARMAP=$BYOBU_CHARMAP ; . ~/.bashrc" \; send-keys Enter + RC_FILE=$(echo "$SHELL" | $BYOBU_SED "s:.*/::") + tmux send-keys " export BYOBU_CHARMAP=$BYOBU_CHARMAP ; . ~/.${RC_FILE}rc" \; send-keys Enter fi # vi: syntax=sh ts=4 noexpandtab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/ip_address new/byobu-5.127/usr/lib/byobu/ip_address --- old/byobu-5.125/usr/lib/byobu/ip_address 2016-09-15 21:22:48.000000000 +0200 +++ new/byobu-5.127/usr/lib/byobu/ip_address 2018-08-12 16:06:06.000000000 +0200 @@ -20,7 +20,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. __ip_address_detail() { - [ -x /sbin/ifconfig ] && /sbin/ifconfig if [ -x /sbin/ip ]; then /sbin/ip -4 addr list /sbin/ip -6 addr list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/logo new/byobu-5.127/usr/lib/byobu/logo --- old/byobu-5.125/usr/lib/byobu/logo 2016-07-29 15:00:36.000000000 +0200 +++ new/byobu-5.127/usr/lib/byobu/logo 2018-08-12 15:42:11.000000000 +0200 @@ -37,7 +37,10 @@ if $MARKUP; then if [ "$BYOBU_BACKEND" = "tmux" ] && [ "$BYOBU_CHARMAP" = "UTF-8" ]; then if [ ! "$VTE_CJK_WIDTH" = "1" ] && [ ! "$VTE_CJK_WIDTH" = "wide" ] ; then - color "colour202" "colour255" ; printf " u "; color - + # color "colour202" "colour255" ; printf " u "; color - + # Ubuntu's logo doesn't display anywhere, except for on Ubuntu itself, which has the Ubuntu font with the logo + # which breaks when you ssh into Ubuntu from elsewhere (Windows, Debian, Mac) + color "colour202" "colour255" ; printf " u "; color - else color m W; printf " u "; color - fi @@ -84,6 +87,11 @@ logo=" > " $MARKUP && printf "$(color b c w)%s$(color -)" "$logo" || printf "$logo" ;; + *glinux*) + logo=" G " + # Green: 3cba54=71, Yellow: f4c20d=214, Red: db3236=167, Blue: 4885ed=69 + $MARKUP && printf "$(color colour0 colour69)██$(color colour0 colour167)■$(color colour0 colour214)■$(color colour0 colour69)▄$(color colour0 colour71)█$(color colour0 colour167)■$(color -)" || printf "$logo" + ;; *mac*|*darwin*) if [ "$BYOBU_BACKEND" = "tmux" ] && [ "$BYOBU_CHARMAP" = "UTF-8" ]; then # The Apple option character diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/network new/byobu-5.127/usr/lib/byobu/network --- old/byobu-5.125/usr/lib/byobu/network 2016-04-08 00:05:52.000000000 +0200 +++ new/byobu-5.127/usr/lib/byobu/network 2018-08-12 16:05:18.000000000 +0200 @@ -21,7 +21,7 @@ __network_detail() { get_network_interface; local interface="$_RET" - LC_ALL=C /sbin/ifconfig "$interface" | $BYOBU_SED 's/\s*$//' + LC_ALL=C /sbin/ip addr show "$interface" | $BYOBU_SED 's/\s*$//' } __network() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/rcs_cost new/byobu-5.127/usr/lib/byobu/rcs_cost --- old/byobu-5.125/usr/lib/byobu/rcs_cost 2016-01-14 13:15:11.000000000 +0100 +++ new/byobu-5.127/usr/lib/byobu/rcs_cost 1970-01-01 01:00:00.000000000 +0100 @@ -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 <jbern...@debian.org> -# Dustin Kirkland <kirkl...@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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/session new/byobu-5.127/usr/lib/byobu/session --- old/byobu-5.125/usr/lib/byobu/session 2016-04-08 00:05:52.000000000 +0200 +++ new/byobu-5.127/usr/lib/byobu/session 2018-05-27 21:30:52.000000000 +0200 @@ -26,7 +26,7 @@ # Note: This will only work in byobu-tmux case "$BYOBU_BACKEND" in tmux) - local count=$(tmux list-sessions 2>/dev/null | wc -l) + local count=$(tmux list-sessions 2>/dev/null | grep -v "^_" | wc -l) if [ $count -gt 1 ]; then color u W k; printf "${ICON_SESSION}#S"; color -- else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/lib/byobu/updates_available new/byobu-5.127/usr/lib/byobu/updates_available --- old/byobu-5.125/usr/lib/byobu/updates_available 2016-09-15 21:22:48.000000000 +0200 +++ new/byobu-5.127/usr/lib/byobu/updates_available 2018-05-27 21:53:59.000000000 +0200 @@ -50,7 +50,7 @@ # Ensure that no more than one of these run at a given time if [ -x /usr/lib/update-notifier/apt-check ]; then # If apt-check binary exists, use it - flock -xn "$flock" /usr/lib/update-notifier/apt-check 2>&1 | awk '-F;' 'END { print $1, $2 }' >"$mycache" 2>/dev/null & + flock -xn "$flock" sh -c "(/usr/lib/update-notifier/apt-check 2>&1 | awk '-F;' 'END { print \$1, \$2 }' >\"${mycache}-x\" 2>/dev/null ; mv \"${mycache}-x\" \"$mycache\")" & elif eval $BYOBU_TEST apt-get >/dev/null; then # If apt-get exists, use it flock -xn "$flock" apt-get -s -o Debug::NoLocking=true upgrade | grep -c ^Inst >$mycache 2>/dev/null & @@ -85,8 +85,17 @@ [ ! -e "$mycache" ] && return 0 if eval $BYOBU_TEST apt-get >/dev/null; then # Debian/ubuntu - [ "/var/lib/apt" -nt "$mycache" ] || [ "/var/lib/apt/lists" -nt "$mycache" ] - return $? + d0=$(($(stat -c %Y $mycache 2>/dev/null)-5)) + d1=$(stat -c %Y /var/lib/apt) + d2=$(stat -c %Y /var/lib/apt/lists) + d3=$(stat -c %Y /var/log/dpkg.log) + now=$(date +%s) + delta=$(($now-$d0)) + if [ $d0 -lt 0 ] || [ $d0 -lt $d1 ] || [ $d0 -lt $d2 ] || [ $d0 -lt $d3 ] || [ 3605 -lt $delta ] ; then + return 0 + else + return 1 + fi elif [ -e "/var/lib/PackageKit/transactions.db" ]; then [ "/var/lib/PackageKit/transactions.db" -nt "$mycache" ] return $? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/share/byobu/desktop/byobu.desktop new/byobu-5.127/usr/share/byobu/desktop/byobu.desktop --- old/byobu-5.125/usr/share/byobu/desktop/byobu.desktop 2017-11-07 07:12:38.000000000 +0100 +++ new/byobu-5.127/usr/share/byobu/desktop/byobu.desktop 2018-08-12 16:09:35.000000000 +0200 @@ -2,7 +2,8 @@ Name=Byobu Terminal Comment=Advanced Command Line and Text Window Manager Icon=byobu -Exec=gnome-terminal --app-id us.kirkland.terminals.byobu -e byobu +Exec=gnome-terminal --app-id us.kirkland.terminals.byobu --class=us.kirkland.terminals.byobu -e byobu Type=Application -Categories=GNOME;GTK;Utility; +Categories=GNOME;GTK;System;Utility;TerminalEmulator; +StartupWMClass=us.kirkland.terminals.byobu X-GNOME-Gettext-Domain=byobu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/share/byobu/keybindings/f-keys.screen new/byobu-5.127/usr/share/byobu/keybindings/f-keys.screen --- old/byobu-5.125/usr/share/byobu/keybindings/f-keys.screen 2016-04-08 00:05:52.000000000 +0200 +++ new/byobu-5.127/usr/share/byobu/keybindings/f-keys.screen 2018-08-12 16:35:30.000000000 +0200 @@ -74,7 +74,7 @@ # No ctrl-shift-F8 (save layout) in Screen bindkey -k k9 $BYOBU_BACKEND -t config 0 byobu-config # F9 | Configuration register s "[g G$>^h" # Goes with Shift-F7 and F12 ~ definition -bindkey "^[[18;2~" eval 'process x' 'process s' 'exec $BYOBU_SED_INLINE -e "/./,/^$/!d" $BYOBU_RUN_DIR/printscreen' '$BYOBU_BACKEND -t PRINTSCREEN $EDITOR $BYOBU_RUN_DIR/printscreen' # Shift-F7 | write the buffer to file, open in a new window +bindkey "^[[18;2~" eval 'process x' 'process s' 'exec $BYOBU_SED_INLINE -e "/./,/^$/!d" $BYOBU_RUN_DIR/printscreen' '$BYOBU_BACKEND -t PRINTSCREEN $BYOBU_EDITOR $BYOBU_RUN_DIR/printscreen' # Shift-F7 | write the buffer to file, open in a new window # F10 | 'toolbar' in gnome-terminal # F11 | 'Full Screen' in gnome-terminal # No alt-F11 (break pane) in Screen @@ -84,7 +84,7 @@ bind $ $BYOBU_BACKEND -t status 0 byobu-status-detail # F12 $ | show detailed status bind @ $BYOBU_BACKEND -t config 0 byobu-config # F12 @ | Configuration bind R process r # F12 R | Reload profile -bind ~ eval 'process x' 'process s' 'exec $BYOBU_SED_INLINE -e "/./,/^$/!d" $BYOBU_RUN_DIR/printscreen' '$BYOBU_BACKEND -t PRINTSCREEN $EDITOR $BYOBU_RUN_DIR/printscreen' # F12 ~ | write the buffer to file, open in a new window +bind ~ eval 'process x' 'process s' 'exec $BYOBU_SED_INLINE -e "/./,/^$/!d" $BYOBU_RUN_DIR/printscreen' '$BYOBU_BACKEND -t PRINTSCREEN $BYOBU_EDITOR $BYOBU_RUN_DIR/printscreen' # F12 ~ | write the buffer to file, open in a new window register d ":source $BYOBU_PREFIX/share/byobu/keybindings/f-keys.screen.disable^M" bind ! eval 'process x' 'process d' 'backtick 111 9999999 9999999 byobu-status menu --disable-f-keys' # F12 ! | toggle on/off f-keys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/share/byobu/keybindings/f-keys.tmux new/byobu-5.127/usr/share/byobu/keybindings/f-keys.tmux --- old/byobu-5.125/usr/share/byobu/keybindings/f-keys.tmux 2016-04-08 00:05:52.000000000 +0200 +++ new/byobu-5.127/usr/share/byobu/keybindings/f-keys.tmux 2018-05-27 21:30:52.000000000 +0200 @@ -62,7 +62,7 @@ bind-key -n S-F6 run-shell 'exec touch $BYOBU_RUN_DIR/no-logout' \; detach bind-key -n C-F6 kill-pane bind-key -n F7 copy-mode -bind-key -n S-F7 capture-pane -S -32768 \; save-buffer "$BYOBU_RUN_DIR/printscreen" \; delete-buffer \; new-window -n "PRINTSCREEN" "$EDITOR $BYOBU_RUN_DIR/printscreen" +bind-key -n S-F7 capture-pane -S -32768 \; save-buffer "$BYOBU_RUN_DIR/printscreen" \; delete-buffer \; new-window -n "PRINTSCREEN" "$BYOBU_EDITOR $BYOBU_RUN_DIR/printscreen" bind-key -n M-NPage copy-mode \; send-keys NPage bind-key -n M-PPage copy-mode \; send-keys PPage bind-key -n F8 command-prompt -p "(rename-window) " "rename-window '%%'" Binary files old/byobu-5.125/usr/share/byobu/pixmaps/byobu.14.png and new/byobu-5.127/usr/share/byobu/pixmaps/byobu.14.png differ Binary files old/byobu-5.125/usr/share/byobu/pixmaps/byobu.192.png and new/byobu-5.127/usr/share/byobu/pixmaps/byobu.192.png differ Binary files old/byobu-5.125/usr/share/byobu/pixmaps/byobu.64.png and new/byobu-5.127/usr/share/byobu/pixmaps/byobu.64.png differ Binary files old/byobu-5.125/usr/share/byobu/pixmaps/byobu.png and new/byobu-5.127/usr/share/byobu/pixmaps/byobu.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/share/byobu/profiles/bashrc new/byobu-5.127/usr/share/byobu/profiles/bashrc --- old/byobu-5.125/usr/share/byobu/profiles/bashrc 2017-10-11 23:08:33.000000000 +0200 +++ new/byobu-5.127/usr/share/byobu/profiles/bashrc 2018-08-12 18:32:10.000000000 +0200 @@ -53,8 +53,8 @@ fi ;; *) - # Use nice colors (green / red / blue) - PS1="${debian_chroot:+($debian_chroot)}\[\e[31m\]\$(byobu_prompt_status)\[\e[00;32m\]\u\[\e[00m\]@\[\e[00;31m\]\h\[\e[00m\]:\[\e[00;36m\]\w\[\e[00m\]\$(byobu_prompt_symbol) " + # Use Googley colors (blue / red / yellow / blue / green / red ) + PS1="${debian_chroot:+($debian_chroot)}\[\e[31m\]\$(byobu_prompt_status)\[\e[38;5;69m\]\u\[\e[38;5;214m\]@\[\e[38;5;167m\]\h\[\e[38;5;214m\]:\[\e[38;5;71m\]\w\[\e[38;5;214m\]\$(byobu_prompt_symbol)\e[00m\] " ;; esac fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/share/byobu/profiles/tmux new/byobu-5.127/usr/share/byobu/profiles/tmux --- old/byobu-5.125/usr/share/byobu/profiles/tmux 2017-02-09 20:59:51.000000000 +0100 +++ new/byobu-5.127/usr/share/byobu/profiles/tmux 2018-08-12 17:52:36.000000000 +0200 @@ -75,6 +75,8 @@ # Must set default-command to $SHELL, in order to not source ~/.profile # BUG: Should *not* hardcode /bin/bash here +# Use byobu-shell here, to show MOTD, but would do so with every new window and split +#set -g default-command 'exec byobu-shell' set -g default-command $SHELL set -g status-bg $BYOBU_DARK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/share/byobu/status/status new/byobu-5.127/usr/share/byobu/status/status --- old/byobu-5.125/usr/share/byobu/status/status 2016-07-29 17:16:14.000000000 +0200 +++ new/byobu-5.127/usr/share/byobu/status/status 2018-08-12 15:54:04.000000000 +0200 @@ -26,12 +26,12 @@ screen_upper_left="color" screen_upper_right="color whoami hostname ip_address menu" 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 #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_left="logo #distro release #arch session" # 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 #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 #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 #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 #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 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 #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 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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/share/man/man1/byobu-select-profile.1 new/byobu-5.127/usr/share/man/man1/byobu-select-profile.1 --- old/byobu-5.125/usr/share/man/man1/byobu-select-profile.1 2016-01-14 13:19:11.000000000 +0100 +++ new/byobu-5.127/usr/share/man/man1/byobu-select-profile.1 2018-08-12 16:42:39.000000000 +0200 @@ -3,7 +3,23 @@ byobu\-select\-profile \- select your Byobu foreground and background colors .SH DESCRIPTION -\fBbyobu\-select\-profile\fP is an application that lists the available Byobu colors and allows you to select the foreground and background color. +\fBbyobu\-select\-profile\fP is an application that changes Byobu's status bar foreground and background colors + +.SH OPTIONS + + -l,--list list available profiles + + -b,--background COLOR set the background color + + -f,--foreground COLOR set the foreground color + + -h,--hostnmae set the colors based on a hash of the hostname + + -i,--ip set the colors based on a hash of the ip + + -r,--random set the colors randomly + + --help this help .SH "SEE ALSO" .PD 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/share/man/man1/byobu.1 new/byobu-5.127/usr/share/man/man1/byobu.1 --- old/byobu-5.125/usr/share/man/man1/byobu.1 2016-11-28 18:33:06.000000000 +0100 +++ new/byobu-5.127/usr/share/man/man1/byobu.1 2018-08-12 17:55:20.000000000 +0200 @@ -51,14 +51,10 @@ \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; the monetary units are US Dollars '$'; this plugin only works when an AWS-compatible metadata server is available at \fIhttp://169.254.169.254\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' \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 \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 @@ -71,7 +67,7 @@ \fBload_average\fP \- the system load average over the last 1 minute; displayed in the lower bar toward the right in black text on a yellow background -\fBlogo\fP \- an approximation of the current operating system's logo; displayed in the lower bar on the far left; you may customize this logo by setting a chosen logo in \fI$BYOBU_CONFIG_DIR/logo\fP, or you may override this with LOGO=:-D in \fI$BYOBU_CONFIG_DIR/statusrc\fP +\fBlogo\fP \- an approximation of the current operating system's logo; displayed in the lower bar on the far left; you may customize this logo by setting a chosen logo with LOGO=:-D in \fI$BYOBU_CONFIG_DIR/statusrc\fP \fBmail\fP \- system mail for the current user; the letter '[M]' is displayed in the lower bar toward the left in black text on a grey background diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/byobu-5.125/usr/share/man/man1/wifi-status.1 new/byobu-5.127/usr/share/man/man1/wifi-status.1 --- old/byobu-5.125/usr/share/man/man1/wifi-status.1 2014-06-18 19:47:13.000000000 +0200 +++ new/byobu-5.127/usr/share/man/man1/wifi-status.1 2018-08-12 16:03:21.000000000 +0200 @@ -10,31 +10,8 @@ This is often useful when trying to associate with an access point. -.SH EXAMPLE - $ wifi-status - -Every 1.0s: iwconfig wlan0; ifconfig wlan0 - -wlan0 IEEE 802.11abgn ESSID:"default" - Mode:Managed Frequency:2.462 GHz Access Point: 00:11:22:33:44:55 - Bit Rate=81 Mb/s Tx-Power=15 dBm - Retry long limit:7 RTS thr:off Fragment thr:off - Power Management:on - Link Quality=70/70 Signal level=-35 dBm - Rx invalid nwid:0 Rx invalid crypt:0 Rx invalid frag:0 - Tx excessive retries:0 Invalid misc:0 Missed beacon:0 - -wlan0 Link encap:Ethernet HWaddr 00:11:22:33:44:55 - inet addr:10.10.10.103 Bcast:10.9.8.255 Mask:255.255.255.0 - inet6 addr: aaaa::bbb:cccc:dddd:eeee/64 Scope:Link - UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 - RX packets:10582 errors:0 dropped:0 overruns:0 frame:0 - TX packets:6383 errors:0 dropped:0 overruns:0 carrier:0 - collisions:0 txqueuelen:1000 - RX bytes:8243607 (8.2 MB) TX bytes:1077323 (1.0 MB) - .SH SEE ALSO -\fBiwconfig\fP(8)\fP, \fBifconfig\fP(8) +\fBiwconfig\fP(8)\fP, \fBip\fP(8) .SH AUTHOR This manpage and the utility was written by Dustin Kirkland <kirkl...@ubuntu.com> for Ubuntu systems (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 published by the Free Software Foundation.
