diff -Nru byobu-5.73/aclocal.m4 byobu-5.74/aclocal.m4 --- byobu-5.73/aclocal.m4 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/aclocal.m4 2014-03-16 19:45:06.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.3], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.3])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -120,6 +120,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -228,7 +234,48 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -236,7 +283,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. diff -Nru byobu-5.73/autom4te.cache/output.0 byobu-5.74/autom4te.cache/output.0 --- byobu-5.73/autom4te.cache/output.0 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/autom4te.cache/output.0 2014-03-16 19:45:06.000000000 +0000 @@ -1705,7 +1705,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2272,6 +2272,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s @@ -2294,7 +2335,7 @@ # Checks for library functions. -ac_config_files="$ac_config_files Makefile etc/byobu/Makefile etc/profile.d/Makefile usr/share/applications/Makefile usr/share/byobu/keybindings/Makefile usr/share/byobu/pixmaps/Makefile usr/share/byobu/profiles/Makefile usr/share/byobu/status/Makefile usr/share/byobu/tests/Makefile usr/share/byobu/windows/Makefile usr/share/doc/byobu/Makefile usr/lib/byobu/Makefile usr/lib/byobu/include/Makefile usr/share/man/man1/Makefile usr/bin/Makefile" +ac_config_files="$ac_config_files Makefile etc/byobu/Makefile etc/profile.d/Makefile etc/profile.d/Z97-byobu.sh usr/share/applications/Makefile usr/bin/byobu usr/bin/byobu-config usr/bin/byobu-ctrl-a usr/bin/byobu-disable usr/bin/byobu-disable-prompt usr/bin/byobu-enable usr/bin/byobu-enable-prompt usr/bin/byobu-export usr/bin/byobu-janitor usr/bin/byobu-launch usr/bin/byobu-launcher usr/bin/byobu-launcher-install usr/bin/byobu-launcher-uninstall usr/bin/byobu-layout usr/bin/byobu-prompt usr/bin/byobu-quiet usr/bin/byobu-reconnect-sockets usr/bin/byobu-select-backend usr/bin/byobu-select-profile usr/bin/byobu-select-session usr/bin/byobu-shell usr/bin/byobu-silent usr/bin/byobu-status usr/bin/byobu-status-detail usr/bin/byobu-ugraph usr/bin/byobu-ulevel usr/lib/byobu/include/config.py usr/lib/byobu/include/dirs usr/lib/byobu/include/toggle-utf8 usr/share/byobu/tests/byobu-time-notifications usr/share/byobu/keybindings/Makefile usr/share/byobu/pixmaps/Makefile usr/share/byobu/profiles/Makefile usr/share/byobu/status/Makefile usr/share/byobu/tests/Makefile usr/share/byobu/windows/Makefile usr/share/doc/byobu/Makefile usr/lib/byobu/Makefile usr/lib/byobu/include/Makefile usr/share/man/man1/Makefile usr/bin/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3016,7 +3057,38 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "etc/byobu/Makefile") CONFIG_FILES="$CONFIG_FILES etc/byobu/Makefile" ;; "etc/profile.d/Makefile") CONFIG_FILES="$CONFIG_FILES etc/profile.d/Makefile" ;; + "etc/profile.d/Z97-byobu.sh") CONFIG_FILES="$CONFIG_FILES etc/profile.d/Z97-byobu.sh" ;; "usr/share/applications/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/applications/Makefile" ;; + "usr/bin/byobu") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu" ;; + "usr/bin/byobu-config") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-config" ;; + "usr/bin/byobu-ctrl-a") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-ctrl-a" ;; + "usr/bin/byobu-disable") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-disable" ;; + "usr/bin/byobu-disable-prompt") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-disable-prompt" ;; + "usr/bin/byobu-enable") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-enable" ;; + "usr/bin/byobu-enable-prompt") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-enable-prompt" ;; + "usr/bin/byobu-export") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-export" ;; + "usr/bin/byobu-janitor") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-janitor" ;; + "usr/bin/byobu-launch") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launch" ;; + "usr/bin/byobu-launcher") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launcher" ;; + "usr/bin/byobu-launcher-install") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launcher-install" ;; + "usr/bin/byobu-launcher-uninstall") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launcher-uninstall" ;; + "usr/bin/byobu-layout") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-layout" ;; + "usr/bin/byobu-prompt") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-prompt" ;; + "usr/bin/byobu-quiet") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-quiet" ;; + "usr/bin/byobu-reconnect-sockets") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-reconnect-sockets" ;; + "usr/bin/byobu-select-backend") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-select-backend" ;; + "usr/bin/byobu-select-profile") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-select-profile" ;; + "usr/bin/byobu-select-session") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-select-session" ;; + "usr/bin/byobu-shell") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-shell" ;; + "usr/bin/byobu-silent") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-silent" ;; + "usr/bin/byobu-status") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-status" ;; + "usr/bin/byobu-status-detail") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-status-detail" ;; + "usr/bin/byobu-ugraph") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-ugraph" ;; + "usr/bin/byobu-ulevel") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-ulevel" ;; + "usr/lib/byobu/include/config.py") CONFIG_FILES="$CONFIG_FILES usr/lib/byobu/include/config.py" ;; + "usr/lib/byobu/include/dirs") CONFIG_FILES="$CONFIG_FILES usr/lib/byobu/include/dirs" ;; + "usr/lib/byobu/include/toggle-utf8") CONFIG_FILES="$CONFIG_FILES usr/lib/byobu/include/toggle-utf8" ;; + "usr/share/byobu/tests/byobu-time-notifications") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/tests/byobu-time-notifications" ;; "usr/share/byobu/keybindings/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/keybindings/Makefile" ;; "usr/share/byobu/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/pixmaps/Makefile" ;; "usr/share/byobu/profiles/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/profiles/Makefile" ;; diff -Nru byobu-5.73/autom4te.cache/output.1 byobu-5.74/autom4te.cache/output.1 --- byobu-5.73/autom4te.cache/output.1 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/autom4te.cache/output.1 2014-03-16 19:45:07.000000000 +0000 @@ -1705,7 +1705,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2272,6 +2272,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s @@ -2294,7 +2335,7 @@ # Checks for library functions. -ac_config_files="$ac_config_files Makefile etc/byobu/Makefile etc/profile.d/Makefile usr/share/applications/Makefile usr/share/byobu/keybindings/Makefile usr/share/byobu/pixmaps/Makefile usr/share/byobu/profiles/Makefile usr/share/byobu/status/Makefile usr/share/byobu/tests/Makefile usr/share/byobu/windows/Makefile usr/share/doc/byobu/Makefile usr/lib/byobu/Makefile usr/lib/byobu/include/Makefile usr/share/man/man1/Makefile usr/bin/Makefile" +ac_config_files="$ac_config_files Makefile etc/byobu/Makefile etc/profile.d/Makefile etc/profile.d/Z97-byobu.sh usr/share/applications/Makefile usr/bin/byobu usr/bin/byobu-config usr/bin/byobu-ctrl-a usr/bin/byobu-disable usr/bin/byobu-disable-prompt usr/bin/byobu-enable usr/bin/byobu-enable-prompt usr/bin/byobu-export usr/bin/byobu-janitor usr/bin/byobu-launch usr/bin/byobu-launcher usr/bin/byobu-launcher-install usr/bin/byobu-launcher-uninstall usr/bin/byobu-layout usr/bin/byobu-prompt usr/bin/byobu-quiet usr/bin/byobu-reconnect-sockets usr/bin/byobu-select-backend usr/bin/byobu-select-profile usr/bin/byobu-select-session usr/bin/byobu-shell usr/bin/byobu-silent usr/bin/byobu-status usr/bin/byobu-status-detail usr/bin/byobu-ugraph usr/bin/byobu-ulevel usr/lib/byobu/include/config.py usr/lib/byobu/include/dirs usr/lib/byobu/include/toggle-utf8 usr/share/byobu/tests/byobu-time-notifications usr/share/byobu/keybindings/Makefile usr/share/byobu/pixmaps/Makefile usr/share/byobu/profiles/Makefile usr/share/byobu/status/Makefile usr/share/byobu/tests/Makefile usr/share/byobu/windows/Makefile usr/share/doc/byobu/Makefile usr/lib/byobu/Makefile usr/lib/byobu/include/Makefile usr/share/man/man1/Makefile usr/bin/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3016,7 +3057,38 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "etc/byobu/Makefile") CONFIG_FILES="$CONFIG_FILES etc/byobu/Makefile" ;; "etc/profile.d/Makefile") CONFIG_FILES="$CONFIG_FILES etc/profile.d/Makefile" ;; + "etc/profile.d/Z97-byobu.sh") CONFIG_FILES="$CONFIG_FILES etc/profile.d/Z97-byobu.sh" ;; "usr/share/applications/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/applications/Makefile" ;; + "usr/bin/byobu") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu" ;; + "usr/bin/byobu-config") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-config" ;; + "usr/bin/byobu-ctrl-a") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-ctrl-a" ;; + "usr/bin/byobu-disable") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-disable" ;; + "usr/bin/byobu-disable-prompt") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-disable-prompt" ;; + "usr/bin/byobu-enable") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-enable" ;; + "usr/bin/byobu-enable-prompt") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-enable-prompt" ;; + "usr/bin/byobu-export") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-export" ;; + "usr/bin/byobu-janitor") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-janitor" ;; + "usr/bin/byobu-launch") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launch" ;; + "usr/bin/byobu-launcher") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launcher" ;; + "usr/bin/byobu-launcher-install") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launcher-install" ;; + "usr/bin/byobu-launcher-uninstall") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launcher-uninstall" ;; + "usr/bin/byobu-layout") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-layout" ;; + "usr/bin/byobu-prompt") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-prompt" ;; + "usr/bin/byobu-quiet") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-quiet" ;; + "usr/bin/byobu-reconnect-sockets") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-reconnect-sockets" ;; + "usr/bin/byobu-select-backend") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-select-backend" ;; + "usr/bin/byobu-select-profile") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-select-profile" ;; + "usr/bin/byobu-select-session") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-select-session" ;; + "usr/bin/byobu-shell") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-shell" ;; + "usr/bin/byobu-silent") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-silent" ;; + "usr/bin/byobu-status") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-status" ;; + "usr/bin/byobu-status-detail") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-status-detail" ;; + "usr/bin/byobu-ugraph") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-ugraph" ;; + "usr/bin/byobu-ulevel") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-ulevel" ;; + "usr/lib/byobu/include/config.py") CONFIG_FILES="$CONFIG_FILES usr/lib/byobu/include/config.py" ;; + "usr/lib/byobu/include/dirs") CONFIG_FILES="$CONFIG_FILES usr/lib/byobu/include/dirs" ;; + "usr/lib/byobu/include/toggle-utf8") CONFIG_FILES="$CONFIG_FILES usr/lib/byobu/include/toggle-utf8" ;; + "usr/share/byobu/tests/byobu-time-notifications") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/tests/byobu-time-notifications" ;; "usr/share/byobu/keybindings/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/keybindings/Makefile" ;; "usr/share/byobu/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/pixmaps/Makefile" ;; "usr/share/byobu/profiles/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/profiles/Makefile" ;; diff -Nru byobu-5.73/autom4te.cache/requests byobu-5.74/autom4te.cache/requests --- byobu-5.73/autom4te.cache/requests 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/autom4te.cache/requests 2014-03-16 19:45:08.000000000 +0000 @@ -1,4 +1,4 @@ -# This file was generated by Autom4te Wed Aug 21 09:31:00 UTC 2013. +# This file was generated by Autom4te Fri Feb 28 12:14:03 UTC 2014. # It contains the lists of macros which have been traced. # It can be safely removed. @@ -12,66 +12,69 @@ [ '/usr/share/autoconf/autoconf/autoconf.m4f', '-', - '/usr/share/aclocal-1.13/internal/ac-config-macro-dirs.m4', - '/usr/share/aclocal-1.13/amversion.m4', - '/usr/share/aclocal-1.13/auxdir.m4', - '/usr/share/aclocal-1.13/cond.m4', - '/usr/share/aclocal-1.13/depend.m4', - '/usr/share/aclocal-1.13/depout.m4', - '/usr/share/aclocal-1.13/init.m4', - '/usr/share/aclocal-1.13/install-sh.m4', - '/usr/share/aclocal-1.13/lead-dot.m4', - '/usr/share/aclocal-1.13/make.m4', - '/usr/share/aclocal-1.13/missing.m4', - '/usr/share/aclocal-1.13/options.m4', - '/usr/share/aclocal-1.13/runlog.m4', - '/usr/share/aclocal-1.13/sanity.m4', - '/usr/share/aclocal-1.13/silent.m4', - '/usr/share/aclocal-1.13/strip.m4', - '/usr/share/aclocal-1.13/substnot.m4', - '/usr/share/aclocal-1.13/tar.m4', + '/usr/share/aclocal-1.14/internal/ac-config-macro-dirs.m4', + '/usr/share/aclocal-1.14/amversion.m4', + '/usr/share/aclocal-1.14/auxdir.m4', + '/usr/share/aclocal-1.14/cond.m4', + '/usr/share/aclocal-1.14/depend.m4', + '/usr/share/aclocal-1.14/depout.m4', + '/usr/share/aclocal-1.14/init.m4', + '/usr/share/aclocal-1.14/install-sh.m4', + '/usr/share/aclocal-1.14/lead-dot.m4', + '/usr/share/aclocal-1.14/make.m4', + '/usr/share/aclocal-1.14/missing.m4', + '/usr/share/aclocal-1.14/options.m4', + '/usr/share/aclocal-1.14/prog-cc-c-o.m4', + '/usr/share/aclocal-1.14/runlog.m4', + '/usr/share/aclocal-1.14/sanity.m4', + '/usr/share/aclocal-1.14/silent.m4', + '/usr/share/aclocal-1.14/strip.m4', + '/usr/share/aclocal-1.14/substnot.m4', + '/usr/share/aclocal-1.14/tar.m4', 'configure.ac' ], { - 'm4_pattern_forbid' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - '_AM_SET_OPTION' => 1, - 'AC_DEFUN' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_MISSING_HAS_RUN' => 1, 'AM_SUBST_NOTMAKE' => 1, - 'AM_MISSING_PROG' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_DEFUN_ONCE' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'include' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'AM_PROG_INSTALL_STRIP' => 1, + '_AM_IF_OPTION' => 1, + 'm4_pattern_forbid' => 1, '_m4_warn' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_AUX_DIR_EXPAND' => 1, 'AM_SANITY_CHECK' => 1, + 'm4_include' => 1, + 'AM_MISSING_PROG' => 1, + '_AM_PROG_CC_C_O' => 1, 'AM_SILENT_RULES' => 1, - 'include' => 1, + 'AM_SET_DEPDIR' => 1, + 'AM_INIT_AUTOMAKE' => 1, + '_AM_AUTOCONF_VERSION' => 1, + 'AU_DEFUN' => 1, + 'AM_MISSING_HAS_RUN' => 1, '_AM_PROG_TAR' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'AM_DEP_TRACK' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + '_AM_SET_OPTION' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AM_MAKE_INCLUDE' => 1, + 'AC_DEFUN_ONCE' => 1, + 'AM_PROG_INSTALL_SH' => 1, + '_AM_DEPENDENCIES' => 1, '_AM_SET_OPTIONS' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AM_RUN_LOG' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - '_AM_IF_OPTION' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'm4_pattern_allow' => 1, - '_AM_AUTOCONF_VERSION' => 1, - '_AM_MANGLE_OPTION' => 1, - 'AM_CONDITIONAL' => 1, + 'AC_DEFUN' => 1, 'AM_SET_LEADING_DOT' => 1, 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AM_SET_DEPDIR' => 1, - '_AM_DEPENDENCIES' => 1, - 'm4_include' => 1, - 'AM_PROG_INSTALL_SH' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, '_AC_AM_CONFIG_HEADER_HOOK' => 1, - 'AU_DEFUN' => 1, - 'AM_MAKE_INCLUDE' => 1 + 'm4_pattern_allow' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_DEP_TRACK' => 1, + '_AM_MANGLE_OPTION' => 1, + 'AM_RUN_LOG' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -86,65 +89,65 @@ 'configure.ac' ], { + 'AM_MAINTAINER_MODE' => 1, + 'LT_INIT' => 1, + '_AM_COND_ELSE' => 1, + 'AM_PATH_GUILE' => 1, '_LT_AC_TAGCONFIG' => 1, - 'AM_PROG_F77_C_O' => 1, - 'AC_INIT' => 1, - 'm4_pattern_forbid' => 1, - 'AC_CANONICAL_TARGET' => 1, + 'AC_SUBST_TRACE' => 1, + '_AM_COND_ENDIF' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'sinclude' => 1, + 'AM_PROG_MOC' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, '_AM_COND_IF' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AM_PROG_CC_C_O' => 1, 'AC_SUBST' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AC_FC_SRCEXT' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AM_PATH_GUILE' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, + 'm4_pattern_allow' => 1, + 'AM_NLS' => 1, + 'AC_CANONICAL_BUILD' => 1, 'AC_REQUIRE_AUX_FILE' => 1, - 'AC_CONFIG_LINKS' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'AC_FC_FREEFORM' => 1, 'LT_SUPPORTED_TAG' => 1, + 'AM_PROG_FC_C_O' => 1, + 'include' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AM_PROG_MKDIR_P' => 1, 'm4_sinclude' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AM_NLS' => 1, - 'AC_FC_PP_DEFINE' => 1, + 'AC_CONFIG_FILES' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'AC_INIT' => 1, + 'AM_POT_TOOLS' => 1, + 'm4_pattern_forbid' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_CONFIG_HEADERS' => 1, '_m4_warn' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'AC_CANONICAL_HOST' => 1, + 'AC_FC_SRCEXT' => 1, + 'AM_PROG_F77_C_O' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'm4_include' => 1, 'AM_MAKEFILE_INCLUDE' => 1, - 'AM_PROG_CXX_C_O' => 1, - '_AM_COND_ENDIF' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, - 'AM_ENABLE_MULTILIB' => 1, - 'AM_PROG_MOC' => 1, + 'AC_LIBSOURCE' => 1, 'AM_SILENT_RULES' => 1, - 'AC_CONFIG_FILES' => 1, - 'include' => 1, - 'LT_INIT' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'AC_CONFIG_LINKS' => 1, 'AM_PROG_AR' => 1, 'AM_GNU_GETTEXT' => 1, - 'AC_LIBSOURCE' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AC_FC_FREEFORM' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'AH_OUTPUT' => 1, - '_AM_SUBST_NOTMAKE' => 1, + 'AC_PROG_LIBTOOL' => 1, 'AC_CONFIG_AUX_DIR' => 1, - 'AM_PROG_CC_C_O' => 1, - 'sinclude' => 1, - 'm4_pattern_allow' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AM_POT_TOOLS' => 1, - 'm4_include' => 1, - '_AM_COND_ELSE' => 1, - 'AC_SUBST_TRACE' => 1 + 'AH_OUTPUT' => 1, + 'AM_INIT_AUTOMAKE' => 1 } ], 'Autom4te::Request' ) ); diff -Nru byobu-5.73/autom4te.cache/traces.0 byobu-5.74/autom4te.cache/traces.0 --- byobu-5.73/autom4te.cache/traces.0 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/autom4te.cache/traces.0 2014-03-16 19:45:06.000000000 +0000 @@ -1,19 +1,19 @@ -m4trace:/usr/share/aclocal-1.13/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.13' +m4trace:/usr/share/aclocal-1.14/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.3], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) -m4trace:/usr/share/aclocal-1.13/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.13.3])dnl +m4trace:/usr/share/aclocal-1.14/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -m4trace:/usr/share/aclocal-1.13/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly. +m4trace:/usr/share/aclocal-1.14/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly. AC_PREREQ([2.50])dnl # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` ]) -m4trace:/usr/share/aclocal-1.13/cond.m4:12: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ([2.52])dnl +m4trace:/usr/share/aclocal-1.14/cond.m4:12: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ([2.52])dnl m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl @@ -33,7 +33,7 @@ AC_MSG_ERROR([[conditional "$1" was never defined. Usually this means the macro was only invoked conditionally.]]) fi])]) -m4trace:/usr/share/aclocal-1.13/depend.m4:26: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl +m4trace:/usr/share/aclocal-1.14/depend.m4:26: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl @@ -163,10 +163,10 @@ test "x$enable_dependency_tracking" != xno \ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) -m4trace:/usr/share/aclocal-1.13/depend.m4:163: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl +m4trace:/usr/share/aclocal-1.14/depend.m4:163: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ]) -m4trace:/usr/share/aclocal-1.13/depend.m4:171: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE([dependency-tracking], [dnl +m4trace:/usr/share/aclocal-1.14/depend.m4:171: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE([dependency-tracking], [dnl AS_HELP_STRING( [--enable-dependency-tracking], [do not reject slow dependency extractors]) @@ -184,7 +184,7 @@ AC_SUBST([am__nodep])dnl _AM_SUBST_NOTMAKE([am__nodep])dnl ]) -m4trace:/usr/share/aclocal-1.13/depout.m4:12: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ +m4trace:/usr/share/aclocal-1.14/depout.m4:12: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. @@ -233,11 +233,11 @@ done } ]) -m4trace:/usr/share/aclocal-1.13/depout.m4:71: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], +m4trace:/usr/share/aclocal-1.14/depout.m4:71: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -m4trace:/usr/share/aclocal-1.13/init.m4:23: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4trace:/usr/share/aclocal-1.14/init.m4:29: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -333,8 +333,49 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -m4trace:/usr/share/aclocal-1.13/init.m4:136: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) +m4trace:/usr/share/aclocal-1.14/init.m4:182: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. _am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do @@ -346,7 +387,7 @@ esac done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -m4trace:/usr/share/aclocal-1.13/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +m4trace:/usr/share/aclocal-1.14/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl if test x"${install_sh}" != xset; then case $am_aux_dir in *\ * | *\ *) @@ -356,7 +397,7 @@ esac fi AC_SUBST([install_sh])]) -m4trace:/usr/share/aclocal-1.13/lead-dot.m4:10: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null +m4trace:/usr/share/aclocal-1.14/lead-dot.m4:10: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null mkdir .tst 2>/dev/null if test -d .tst; then am__leading_dot=. @@ -365,7 +406,7 @@ fi rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -m4trace:/usr/share/aclocal-1.13/make.m4:12: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} +m4trace:/usr/share/aclocal-1.14/make.m4:12: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} cat > confinc << 'END' am__doit: @echo this is the am__doit target @@ -402,10 +443,10 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -m4trace:/usr/share/aclocal-1.13/missing.m4:11: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN]) +m4trace:/usr/share/aclocal-1.14/missing.m4:11: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN]) $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) -m4trace:/usr/share/aclocal-1.13/missing.m4:20: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +m4trace:/usr/share/aclocal-1.14/missing.m4:20: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -423,16 +464,49 @@ AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -m4trace:/usr/share/aclocal-1.13/options.m4:11: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -m4trace:/usr/share/aclocal-1.13/options.m4:17: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), [1])]) -m4trace:/usr/share/aclocal-1.13/options.m4:23: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -m4trace:/usr/share/aclocal-1.13/options.m4:29: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -m4trace:/usr/share/aclocal-1.13/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD +m4trace:/usr/share/aclocal-1.14/options.m4:11: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +m4trace:/usr/share/aclocal-1.14/options.m4:17: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), [1])]) +m4trace:/usr/share/aclocal-1.14/options.m4:23: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +m4trace:/usr/share/aclocal-1.14/options.m4:29: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +m4trace:/usr/share/aclocal-1.14/prog-cc-c-o.m4:12: -1- AC_DEFUN([_AM_PROG_CC_C_O], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) +m4trace:/usr/share/aclocal-1.14/prog-cc-c-o.m4:47: -1- AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) +m4trace:/usr/share/aclocal-1.14/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD (exit $ac_status); }]) -m4trace:/usr/share/aclocal-1.13/sanity.m4:11: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) +m4trace:/usr/share/aclocal-1.14/sanity.m4:11: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -503,7 +577,7 @@ AC_MSG_RESULT([done])]) rm -f conftest.file ]) -m4trace:/usr/share/aclocal-1.13/silent.m4:12: -1- AC_DEFUN([AM_SILENT_RULES], [AC_ARG_ENABLE([silent-rules], [dnl +m4trace:/usr/share/aclocal-1.14/silent.m4:12: -1- AC_DEFUN([AM_SILENT_RULES], [AC_ARG_ENABLE([silent-rules], [dnl AS_HELP_STRING( [--enable-silent-rules], [less verbose build output (undo: "make V=1")]) @@ -551,7 +625,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -m4trace:/usr/share/aclocal-1.13/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +m4trace:/usr/share/aclocal-1.14/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl # Installed binaries are usually stripped using 'strip' when the user # run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake @@ -562,9 +636,9 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -m4trace:/usr/share/aclocal-1.13/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE]) -m4trace:/usr/share/aclocal-1.13/substnot.m4:17: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4trace:/usr/share/aclocal-1.13/tar.m4:23: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used +m4trace:/usr/share/aclocal-1.14/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE]) +m4trace:/usr/share/aclocal-1.14/substnot.m4:17: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +m4trace:/usr/share/aclocal-1.14/tar.m4:23: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) @@ -727,7 +801,7 @@ m4trace:configure.ac:6: -1- AM_INIT_AUTOMAKE([byobu], [3.0]) m4trace:configure.ac:6: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) m4trace:configure.ac:6: -1- AM_SET_CURRENT_AUTOMAKE_VERSION -m4trace:configure.ac:6: -1- AM_AUTOMAKE_VERSION([1.13.3]) +m4trace:configure.ac:6: -1- AM_AUTOMAKE_VERSION([1.14.1]) m4trace:configure.ac:6: -1- _AM_AUTOCONF_VERSION([2.69]) m4trace:configure.ac:6: -1- m4_pattern_allow([^INSTALL_PROGRAM$]) m4trace:configure.ac:6: -1- m4_pattern_allow([^INSTALL_SCRIPT$]) @@ -735,7 +809,7 @@ m4trace:configure.ac:6: -1- m4_pattern_allow([^am__isrc$]) m4trace:configure.ac:6: -1- _AM_SUBST_NOTMAKE([am__isrc]) m4trace:configure.ac:6: -1- m4_pattern_allow([^CYGPATH_W$]) -m4trace:configure.ac:6: -1- _m4_warn([obsolete], [AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated.], [/usr/share/aclocal-1.13/init.m4:23: AM_INIT_AUTOMAKE is expanded from... +m4trace:configure.ac:6: -1- _m4_warn([obsolete], [AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated.], [/usr/share/aclocal-1.14/init.m4:29: AM_INIT_AUTOMAKE is expanded from... configure.ac:6: the top level]) m4trace:configure.ac:6: -1- m4_pattern_allow([^PACKAGE$]) m4trace:configure.ac:6: -1- m4_pattern_allow([^VERSION$]) diff -Nru byobu-5.73/autom4te.cache/traces.1 byobu-5.74/autom4te.cache/traces.1 --- byobu-5.73/autom4te.cache/traces.1 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/autom4te.cache/traces.1 2014-03-16 19:45:07.000000000 +0000 @@ -148,7 +148,7 @@ m4trace:configure.ac:5: -1- m4_pattern_allow([^target_alias$]) m4trace:configure.ac:6: -1- AM_INIT_AUTOMAKE([byobu], [3.0]) m4trace:configure.ac:6: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) -m4trace:configure.ac:6: -1- AM_AUTOMAKE_VERSION([1.13.3]) +m4trace:configure.ac:6: -1- AM_AUTOMAKE_VERSION([1.14.1]) m4trace:configure.ac:6: -1- AC_REQUIRE_AUX_FILE([install-sh]) m4trace:configure.ac:6: -1- AC_SUBST([INSTALL_PROGRAM]) m4trace:configure.ac:6: -1- AC_SUBST_TRACE([INSTALL_PROGRAM]) @@ -166,7 +166,7 @@ m4trace:configure.ac:6: -1- AC_SUBST([CYGPATH_W]) m4trace:configure.ac:6: -1- AC_SUBST_TRACE([CYGPATH_W]) m4trace:configure.ac:6: -1- m4_pattern_allow([^CYGPATH_W$]) -m4trace:configure.ac:6: -1- _m4_warn([obsolete], [AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated.], [aclocal.m4:134: AM_INIT_AUTOMAKE is expanded from... +m4trace:configure.ac:6: -1- _m4_warn([obsolete], [AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated.], [aclocal.m4:140: AM_INIT_AUTOMAKE is expanded from... configure.ac:6: the top level]) m4trace:configure.ac:6: -1- AC_SUBST([PACKAGE], [byobu]) m4trace:configure.ac:6: -1- AC_SUBST_TRACE([PACKAGE]) @@ -254,7 +254,38 @@ m4trace:configure.ac:19: -1- AC_CONFIG_FILES([Makefile \ etc/byobu/Makefile \ etc/profile.d/Makefile \ + etc/profile.d/Z97-byobu.sh usr/share/applications/Makefile \ + usr/bin/byobu \ + usr/bin/byobu-config \ + usr/bin/byobu-ctrl-a \ + usr/bin/byobu-disable \ + usr/bin/byobu-disable-prompt \ + usr/bin/byobu-enable \ + usr/bin/byobu-enable-prompt \ + usr/bin/byobu-export \ + usr/bin/byobu-janitor \ + usr/bin/byobu-launch \ + usr/bin/byobu-launcher \ + usr/bin/byobu-launcher-install \ + usr/bin/byobu-launcher-uninstall \ + usr/bin/byobu-layout \ + usr/bin/byobu-prompt \ + usr/bin/byobu-quiet \ + usr/bin/byobu-reconnect-sockets \ + usr/bin/byobu-select-backend \ + usr/bin/byobu-select-profile \ + usr/bin/byobu-select-session \ + usr/bin/byobu-shell \ + usr/bin/byobu-silent \ + usr/bin/byobu-status \ + usr/bin/byobu-status-detail \ + usr/bin/byobu-ugraph \ + usr/bin/byobu-ulevel \ + usr/lib/byobu/include/config.py \ + usr/lib/byobu/include/dirs \ + usr/lib/byobu/include/toggle-utf8 \ + usr/share/byobu/tests/byobu-time-notifications \ usr/share/byobu/keybindings/Makefile \ usr/share/byobu/pixmaps/Makefile \ usr/share/byobu/profiles/Makefile \ diff -Nru byobu-5.73/ChangeLog byobu-5.74/ChangeLog --- byobu-5.73/ChangeLog 2014-02-17 21:05:05.000000000 +0000 +++ byobu-5.74/ChangeLog 2014-03-16 19:45:06.000000000 +0000 @@ -1,4 +1,78 @@ -byobu (5.73) released; urgency=low +byobu (5.74) released; urgency=low + + [ Dustin Kirkland ] + * usr/lib/byobu/include/ec2instancespricing.py: LP: #1286367 + - merged in updated instance pricing script from + https://github.com/erans/ec2instancespricing + * usr/share/byobu/profiles/tmux: LP: #1273685 + - remove double sourcing of local .tmux.conf + * usr/lib/byobu/battery: LP: #1270451 + - add support for yet another batter type (Android) + - thanks to Felix Krull for the initial patch + * usr/share/byobu/profiles/tmux: LP: #1270551 + - enable ctrl-left and ctrl-right to move among words + + [ Chris Johnston ] + * usr/share/man/man1/byobu-layout.1: LP: #1288738 + - fix manpage typo + + [ Mike Miller ] + * usr/lib/byobu/logo: LP: #1278006 + - fix RHEL detection for logo + + [ Daniel Hahler ] + * usr/bin/byobu-keybindings: LP: #1258093 + - fix toggling of f-keys + * usr/share/byobu/profiles/tmux: LP: #1258534 + - ensure that we respect BYOBU_NO_TITLE in tmux + + [ Ryo ONODERA ] + * configure.ac, etc/profile.d/Z97-byobu.sh => etc/profile.d/Z97- + byobu.sh.in, usr/bin/byobu-config => usr/bin/byobu-config.in, + usr/bin/byobu-ctrl-a => usr/bin/byobu-ctrl-a.in, usr/bin/byobu- + disable-prompt => usr/bin/byobu-disable-prompt.in, usr/bin/byobu- + disable => usr/bin/byobu-disable.in, usr/bin/byobu-enable-prompt => + usr/bin/byobu-enable-prompt.in, usr/bin/byobu-enable => + usr/bin/byobu-enable.in, usr/bin/byobu-export => usr/bin/byobu- + export.in, usr/bin/byobu-janitor => usr/bin/byobu-janitor.in, + usr/bin/byobu-launcher-install => usr/bin/byobu-launcher-install.in, + usr/bin/byobu-launcher-uninstall => usr/bin/byobu-launcher- + uninstall.in, usr/bin/byobu-launcher => usr/bin/byobu-launcher.in, + usr/bin/byobu-launch => usr/bin/byobu-launch.in, usr/bin/byobu- + layout => usr/bin/byobu-layout.in, usr/bin/byobu-prompt => + usr/bin/byobu-prompt.in, usr/bin/byobu-quiet => usr/bin/byobu- + quiet.in, usr/bin/byobu-reconnect-sockets => usr/bin/byobu- + reconnect-sockets.in, usr/bin/byobu-select-backend => usr/bin/byobu- + select-backend.in, usr/bin/byobu-select-profile => usr/bin/byobu- + select-profile.in, usr/bin/byobu-select-session => usr/bin/byobu- + select-session.in, usr/bin/byobu-shell => usr/bin/byobu-shell.in, + usr/bin/byobu-silent => usr/bin/byobu-silent.in, usr/bin/byobu- + status-detail => usr/bin/byobu-status-detail.in, usr/bin/byobu- + status => usr/bin/byobu-status.in, usr/bin/byobu-ugraph => + usr/bin/byobu-ugraph.in, usr/bin/byobu-ulevel => usr/bin/byobu- + ulevel.in, usr/bin/byobu => usr/bin/byobu.in, + usr/lib/byobu/include/config.py => + usr/lib/byobu/include/config.py.in, usr/lib/byobu/include/dirs => + usr/lib/byobu/include/dirs.in, usr/lib/byobu/include/toggle-utf8 => + usr/lib/byobu/include/toggle-utf8.in, usr/share/byobu/tests/byobu- + time-notifications => usr/share/byobu/tests/byobu-time- + notifications.in: + - use @prefix@ rather than hardcoding /usr, makes code + more portable and easier to build with ./config --prefix + + [ Arminius Silvanus ] + * usr/share/byobu/profiles/bashrc: LP: #1280550 + - test the $BASH variable, rather than $SHELL, to tell if we're + running in a bash environment + + [ Jan Klepek ] + * usr/lib/byobu/include/config.py: LP: #1286249 + - fall back to using the distro status file, fixes + crash in config if status file disappears + + -- Dustin Kirkland Mon, 17 Feb 2014 15:07:01 -0600 + +byobu (5.73-0ubuntu1) trusty; urgency=low * usr/lib/byobu/include/Makefile.am, usr/lib/byobu/include/tmux-send- command-to-all-panes, usr/lib/byobu/include/tmux-send-command-to- @@ -9,7 +83,7 @@ - these will prompt you for a command, and then run that command in all splits or windows (respectively) - -- Dustin Kirkland Wed, 12 Feb 2014 14:30:40 -0600 + -- Dustin Kirkland Mon, 17 Feb 2014 15:06:58 -0600 byobu (5.72-0ubuntu1) trusty; urgency=low diff -Nru byobu-5.73/configure byobu-5.74/configure --- byobu-5.73/configure 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/configure 2014-03-16 19:45:08.000000000 +0000 @@ -1705,7 +1705,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2272,6 +2272,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s @@ -2294,7 +2335,7 @@ # Checks for library functions. -ac_config_files="$ac_config_files Makefile etc/byobu/Makefile etc/profile.d/Makefile usr/share/applications/Makefile usr/share/byobu/keybindings/Makefile usr/share/byobu/pixmaps/Makefile usr/share/byobu/profiles/Makefile usr/share/byobu/status/Makefile usr/share/byobu/tests/Makefile usr/share/byobu/windows/Makefile usr/share/doc/byobu/Makefile usr/lib/byobu/Makefile usr/lib/byobu/include/Makefile usr/share/man/man1/Makefile usr/bin/Makefile" +ac_config_files="$ac_config_files Makefile etc/byobu/Makefile etc/profile.d/Makefile etc/profile.d/Z97-byobu.sh usr/share/applications/Makefile usr/bin/byobu usr/bin/byobu-config usr/bin/byobu-ctrl-a usr/bin/byobu-disable usr/bin/byobu-disable-prompt usr/bin/byobu-enable usr/bin/byobu-enable-prompt usr/bin/byobu-export usr/bin/byobu-janitor usr/bin/byobu-launch usr/bin/byobu-launcher usr/bin/byobu-launcher-install usr/bin/byobu-launcher-uninstall usr/bin/byobu-layout usr/bin/byobu-prompt usr/bin/byobu-quiet usr/bin/byobu-reconnect-sockets usr/bin/byobu-select-backend usr/bin/byobu-select-profile usr/bin/byobu-select-session usr/bin/byobu-shell usr/bin/byobu-silent usr/bin/byobu-status usr/bin/byobu-status-detail usr/bin/byobu-ugraph usr/bin/byobu-ulevel usr/lib/byobu/include/config.py usr/lib/byobu/include/dirs usr/lib/byobu/include/toggle-utf8 usr/share/byobu/tests/byobu-time-notifications usr/share/byobu/keybindings/Makefile usr/share/byobu/pixmaps/Makefile usr/share/byobu/profiles/Makefile usr/share/byobu/status/Makefile usr/share/byobu/tests/Makefile usr/share/byobu/windows/Makefile usr/share/doc/byobu/Makefile usr/lib/byobu/Makefile usr/lib/byobu/include/Makefile usr/share/man/man1/Makefile usr/bin/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3016,7 +3057,38 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "etc/byobu/Makefile") CONFIG_FILES="$CONFIG_FILES etc/byobu/Makefile" ;; "etc/profile.d/Makefile") CONFIG_FILES="$CONFIG_FILES etc/profile.d/Makefile" ;; + "etc/profile.d/Z97-byobu.sh") CONFIG_FILES="$CONFIG_FILES etc/profile.d/Z97-byobu.sh" ;; "usr/share/applications/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/applications/Makefile" ;; + "usr/bin/byobu") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu" ;; + "usr/bin/byobu-config") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-config" ;; + "usr/bin/byobu-ctrl-a") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-ctrl-a" ;; + "usr/bin/byobu-disable") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-disable" ;; + "usr/bin/byobu-disable-prompt") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-disable-prompt" ;; + "usr/bin/byobu-enable") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-enable" ;; + "usr/bin/byobu-enable-prompt") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-enable-prompt" ;; + "usr/bin/byobu-export") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-export" ;; + "usr/bin/byobu-janitor") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-janitor" ;; + "usr/bin/byobu-launch") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launch" ;; + "usr/bin/byobu-launcher") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launcher" ;; + "usr/bin/byobu-launcher-install") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launcher-install" ;; + "usr/bin/byobu-launcher-uninstall") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-launcher-uninstall" ;; + "usr/bin/byobu-layout") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-layout" ;; + "usr/bin/byobu-prompt") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-prompt" ;; + "usr/bin/byobu-quiet") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-quiet" ;; + "usr/bin/byobu-reconnect-sockets") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-reconnect-sockets" ;; + "usr/bin/byobu-select-backend") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-select-backend" ;; + "usr/bin/byobu-select-profile") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-select-profile" ;; + "usr/bin/byobu-select-session") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-select-session" ;; + "usr/bin/byobu-shell") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-shell" ;; + "usr/bin/byobu-silent") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-silent" ;; + "usr/bin/byobu-status") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-status" ;; + "usr/bin/byobu-status-detail") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-status-detail" ;; + "usr/bin/byobu-ugraph") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-ugraph" ;; + "usr/bin/byobu-ulevel") CONFIG_FILES="$CONFIG_FILES usr/bin/byobu-ulevel" ;; + "usr/lib/byobu/include/config.py") CONFIG_FILES="$CONFIG_FILES usr/lib/byobu/include/config.py" ;; + "usr/lib/byobu/include/dirs") CONFIG_FILES="$CONFIG_FILES usr/lib/byobu/include/dirs" ;; + "usr/lib/byobu/include/toggle-utf8") CONFIG_FILES="$CONFIG_FILES usr/lib/byobu/include/toggle-utf8" ;; + "usr/share/byobu/tests/byobu-time-notifications") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/tests/byobu-time-notifications" ;; "usr/share/byobu/keybindings/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/keybindings/Makefile" ;; "usr/share/byobu/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/pixmaps/Makefile" ;; "usr/share/byobu/profiles/Makefile") CONFIG_FILES="$CONFIG_FILES usr/share/byobu/profiles/Makefile" ;; diff -Nru byobu-5.73/configure.ac byobu-5.74/configure.ac --- byobu-5.73/configure.ac 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/configure.ac 2014-02-28 23:22:27.000000000 +0000 @@ -19,7 +19,38 @@ AC_OUTPUT(Makefile \ etc/byobu/Makefile \ etc/profile.d/Makefile \ + etc/profile.d/Z97-byobu.sh usr/share/applications/Makefile \ + usr/bin/byobu \ + usr/bin/byobu-config \ + usr/bin/byobu-ctrl-a \ + usr/bin/byobu-disable \ + usr/bin/byobu-disable-prompt \ + usr/bin/byobu-enable \ + usr/bin/byobu-enable-prompt \ + usr/bin/byobu-export \ + usr/bin/byobu-janitor \ + usr/bin/byobu-launch \ + usr/bin/byobu-launcher \ + usr/bin/byobu-launcher-install \ + usr/bin/byobu-launcher-uninstall \ + usr/bin/byobu-layout \ + usr/bin/byobu-prompt \ + usr/bin/byobu-quiet \ + usr/bin/byobu-reconnect-sockets \ + usr/bin/byobu-select-backend \ + usr/bin/byobu-select-profile \ + usr/bin/byobu-select-session \ + usr/bin/byobu-shell \ + usr/bin/byobu-silent \ + usr/bin/byobu-status \ + usr/bin/byobu-status-detail \ + usr/bin/byobu-ugraph \ + usr/bin/byobu-ulevel \ + usr/lib/byobu/include/config.py \ + usr/lib/byobu/include/dirs \ + usr/lib/byobu/include/toggle-utf8 \ + usr/share/byobu/tests/byobu-time-notifications \ usr/share/byobu/keybindings/Makefile \ usr/share/byobu/pixmaps/Makefile \ usr/share/byobu/profiles/Makefile \ diff -Nru byobu-5.73/debian/changelog byobu-5.74/debian/changelog --- byobu-5.73/debian/changelog 2014-02-17 21:05:20.000000000 +0000 +++ byobu-5.74/debian/changelog 2014-03-16 19:45:44.000000000 +0000 @@ -1,3 +1,77 @@ +byobu (5.74-0ubuntu1) trusty; urgency=low + + [ Dustin Kirkland ] + * usr/lib/byobu/include/ec2instancespricing.py: LP: #1286367 + - merged in updated instance pricing script from + https://github.com/erans/ec2instancespricing + * usr/share/byobu/profiles/tmux: LP: #1273685 + - remove double sourcing of local .tmux.conf + * usr/lib/byobu/battery: LP: #1270451 + - add support for yet another batter type (Android) + - thanks to Felix Krull for the initial patch + * usr/share/byobu/profiles/tmux: LP: #1270551 + - enable ctrl-left and ctrl-right to move among words + + [ Chris Johnston ] + * usr/share/man/man1/byobu-layout.1: LP: #1288738 + - fix manpage typo + + [ Mike Miller ] + * usr/lib/byobu/logo: LP: #1278006 + - fix RHEL detection for logo + + [ Daniel Hahler ] + * usr/bin/byobu-keybindings: LP: #1258093 + - fix toggling of f-keys + * usr/share/byobu/profiles/tmux: LP: #1258534 + - ensure that we respect BYOBU_NO_TITLE in tmux + + [ Ryo ONODERA ] + * configure.ac, etc/profile.d/Z97-byobu.sh => etc/profile.d/Z97- + byobu.sh.in, usr/bin/byobu-config => usr/bin/byobu-config.in, + usr/bin/byobu-ctrl-a => usr/bin/byobu-ctrl-a.in, usr/bin/byobu- + disable-prompt => usr/bin/byobu-disable-prompt.in, usr/bin/byobu- + disable => usr/bin/byobu-disable.in, usr/bin/byobu-enable-prompt => + usr/bin/byobu-enable-prompt.in, usr/bin/byobu-enable => + usr/bin/byobu-enable.in, usr/bin/byobu-export => usr/bin/byobu- + export.in, usr/bin/byobu-janitor => usr/bin/byobu-janitor.in, + usr/bin/byobu-launcher-install => usr/bin/byobu-launcher-install.in, + usr/bin/byobu-launcher-uninstall => usr/bin/byobu-launcher- + uninstall.in, usr/bin/byobu-launcher => usr/bin/byobu-launcher.in, + usr/bin/byobu-launch => usr/bin/byobu-launch.in, usr/bin/byobu- + layout => usr/bin/byobu-layout.in, usr/bin/byobu-prompt => + usr/bin/byobu-prompt.in, usr/bin/byobu-quiet => usr/bin/byobu- + quiet.in, usr/bin/byobu-reconnect-sockets => usr/bin/byobu- + reconnect-sockets.in, usr/bin/byobu-select-backend => usr/bin/byobu- + select-backend.in, usr/bin/byobu-select-profile => usr/bin/byobu- + select-profile.in, usr/bin/byobu-select-session => usr/bin/byobu- + select-session.in, usr/bin/byobu-shell => usr/bin/byobu-shell.in, + usr/bin/byobu-silent => usr/bin/byobu-silent.in, usr/bin/byobu- + status-detail => usr/bin/byobu-status-detail.in, usr/bin/byobu- + status => usr/bin/byobu-status.in, usr/bin/byobu-ugraph => + usr/bin/byobu-ugraph.in, usr/bin/byobu-ulevel => usr/bin/byobu- + ulevel.in, usr/bin/byobu => usr/bin/byobu.in, + usr/lib/byobu/include/config.py => + usr/lib/byobu/include/config.py.in, usr/lib/byobu/include/dirs => + usr/lib/byobu/include/dirs.in, usr/lib/byobu/include/toggle-utf8 => + usr/lib/byobu/include/toggle-utf8.in, usr/share/byobu/tests/byobu- + time-notifications => usr/share/byobu/tests/byobu-time- + notifications.in: + - use @prefix@ rather than hardcoding /usr, makes code + more portable and easier to build with ./config --prefix + + [ Arminius Silvanus ] + * usr/share/byobu/profiles/bashrc: LP: #1280550 + - test the $BASH variable, rather than $SHELL, to tell if we're + running in a bash environment + + [ Jan Klepek ] + * usr/lib/byobu/include/config.py: LP: #1286249 + - fall back to using the distro status file, fixes + crash in config if status file disappears + + -- Dustin Kirkland Mon, 17 Feb 2014 15:07:01 -0600 + byobu (5.73-0ubuntu1) trusty; urgency=low * usr/lib/byobu/include/Makefile.am, usr/lib/byobu/include/tmux-send- @@ -9,7 +83,7 @@ - these will prompt you for a command, and then run that command in all splits or windows (respectively) - -- Dustin Kirkland Wed, 12 Feb 2014 14:30:40 -0600 + -- Dustin Kirkland Mon, 17 Feb 2014 15:06:58 -0600 byobu (5.72-0ubuntu1) trusty; urgency=low diff -Nru byobu-5.73/etc/byobu/Makefile.in byobu-5.74/etc/byobu/Makefile.in --- byobu-5.73/etc/byobu/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/etc/byobu/Makefile.in 2014-03-16 19:45:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru byobu-5.73/etc/profile.d/Makefile.in byobu-5.74/etc/profile.d/Makefile.in --- byobu-5.73/etc/profile.d/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/etc/profile.d/Makefile.in 2014-03-16 19:45:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -77,13 +77,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = etc/profile.d -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/Z97-byobu.sh.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = Z97-byobu.sh CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -244,6 +245,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +Z97-byobu.sh: $(top_builddir)/config.status $(srcdir)/Z97-byobu.sh.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-etcDATA: $(etc_DATA) @$(NORMAL_INSTALL) @list='$(etc_DATA)'; test -n "$(etcdir)" || list=; \ diff -Nru byobu-5.73/etc/profile.d/Z97-byobu.sh byobu-5.74/etc/profile.d/Z97-byobu.sh --- byobu-5.73/etc/profile.d/Z97-byobu.sh 2013-10-18 20:25:32.000000000 +0000 +++ byobu-5.74/etc/profile.d/Z97-byobu.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#!/bin/sh -# Z97-byobu.sh - allow any user to opt into auto-launching byobu -# Copyright (C) 2011 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -# Allow any user to opt into auto-launching byobu by setting LC_BYOBU=1 -# Apologies for borrowing the LC_BYOBU namespace, but: -# a) it's reasonable to assume that no one else is using LC_BYOBU -# b) LC_* is sent and receieved by most /etc/ssh/ssh*_config -if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "/usr/bin/byobu-launch" ]; then - . /usr/bin/byobu-launch -elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "/usr/bin/byobu-launch" ]; then - . /usr/bin/byobu-launch -elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "/usr/bin/byobu-launch" ]; then - export BYOBU_BACKEND="screen" - . /usr/bin/byobu-launch -elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "/usr/bin/byobu-launch" ]; then - export BYOBU_BACKEND="tmux" - . /usr/bin/byobu-launch -fi - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/etc/profile.d/Z97-byobu.sh.in byobu-5.74/etc/profile.d/Z97-byobu.sh.in --- byobu-5.73/etc/profile.d/Z97-byobu.sh.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/etc/profile.d/Z97-byobu.sh.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,35 @@ +#!/bin/sh +# Z97-byobu.sh - allow any user to opt into auto-launching byobu +# Copyright (C) 2011 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +# Allow any user to opt into auto-launching byobu by setting LC_BYOBU=1 +# Apologies for borrowing the LC_BYOBU namespace, but: +# a) it's reasonable to assume that no one else is using LC_BYOBU +# b) LC_* is sent and receieved by most /etc/ssh/ssh*_config +if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "@prefix@/bin/byobu-launch" ]; then + . @prefix@/bin/byobu-launch +elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "@prefix@/bin/byobu-launch" ]; then + . @prefix@/bin/byobu-launch +elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "@prefix@/bin/byobu-launch" ]; then + export BYOBU_BACKEND="screen" + . @prefix@/bin/byobu-launch +elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "@prefix@/bin/byobu-launch" ]; then + export BYOBU_BACKEND="tmux" + . @prefix@/bin/byobu-launch +fi + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/INSTALL byobu-5.74/INSTALL --- byobu-5.73/INSTALL 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/INSTALL 2014-03-16 19:45:07.000000000 +0000 @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented diff -Nru byobu-5.73/Makefile.in byobu-5.74/Makefile.in --- byobu-5.73/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/Makefile.in 2014-03-16 19:45:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -501,10 +501,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -546,9 +552,10 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff -Nru byobu-5.73/missing byobu-5.74/missing --- byobu-5.73/missing 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/missing 2014-03-16 19:45:07.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -Nru byobu-5.73/usr/bin/byobu byobu-5.74/usr/bin/byobu --- byobu-5.73/usr/bin/byobu 2014-02-12 20:30:40.000000000 +0000 +++ byobu-5.74/usr/bin/byobu 1970-01-01 00:00:00.000000000 +0000 @@ -1,208 +0,0 @@ -#!/bin/sh -e -# -# byobu - wrapper script -# Copyright (C) 2008-2009 Canonical Ltd. -# Copyright (C) 2008-2013 Dustin Kirkland -# -# Authors: Dustin Kirkland -# -# 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 . - -VERSION=5.73 -PKG="byobu" - -# All sorts of things go wrong if you don't own your $HOME dir. -# This happens under sudo, if you don't use the -H option; Byobu will -# create a bunch of files in your $HOME which will be owned by root. -if [ ! -O "$HOME" ]; then - echo "Cannot run $PKG because [$USER] does not own [$HOME]" 1>&2 - if [ -n "$SUDO_USER" ]; then - echo "To run $PKG under sudo, you MUST use 'sudo -H'" 1>&2 - fi - exit 1 -fi - -# Source local byobu config -if [ -r "$HOME/.byoburc" ]; then - # Ensure that this configuration is usable - . "$HOME/.byoburc" || mv -f "$HOME/.byoburc".orig -fi -if [ -z "${BYOBU_PREFIX}" ]; then - # Find and export the installation location prefix - greadlink -f . >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink" - prefix="$(dirname $(dirname $($BYOBU_READLINK -f $0)))" - if [ "$prefix" != "/usr" ]; then - echo "export BYOBU_PREFIX='$prefix'" >> "$HOME/.byoburc" - . "$HOME/.byoburc" - fi -fi -export BYOBU_CHARMAP=$(locale charmap) -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -# Override backend if we can determine intentions from argv[0] -[ -r "$HOME/.$PKG/backend" ] && . "$HOME/.$PKG/backend" -case "$0" in - *byobu-screen) BYOBU_BACKEND="screen" ;; - *byobu-tmux) BYOBU_BACKEND="tmux" ;; -esac - -# At this point, we're sure BYOBU_BACKEND is properly defined -export BYOBU_BACKEND - -# Store the parent tty -export BYOBU_TTY=$(tty) - -# Get the default window name -[ -n "$BYOBU_WINDOW_NAME" ] || BYOBU_WINDOW_NAME=- - -# Add a version argument for debugging purposes -if [ "$#" = "1" ]; then - case "$1" in - -v|--version) - echo "$PKG version $VERSION" - if $BYOBU_TEST bash >/dev/null 2>&1; then - # Check ulimits - u=$(bash -c "ulimit -n") - [ "$u" = "unlimited" ] || [ $u -ge 15 ] || echo "WARNING: ulimit -n is too low" 1>&2 - u=$(bash -c "ulimit -u") - [ "$u" = "unlimited" ] || [ $u -ge 1600 ] || echo "WARNING: ulimit -u is too low" 1>&2 - fi - exec $BYOBU_BACKEND $BYOBU_ARG_VERSION - exit 0 - ;; - esac -fi - -# Check if we're being autolaunched, and this user explicitly does not want it. -if [ "$0" = "/etc/profile.d/Z98-$PKG.sh" ] && [ -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then - exit 0 -fi - -# Sanitize the environment -byobu-janitor --force - -# Set the window title -[ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc" -. $BYOBU_PREFIX/lib/$PKG/ip_address -[ -n "$BYOBU_NO_TITLE" ] || printf "\033]0;${USER}@$(hostname) ($(__ip_address t)) - ${PKG}\007" - -# Drop a symlink to the ssh socket in $HOME, since we can ensure that exists -if [ -S "$SSH_AUTH_SOCK" ] && [ ! -h "$SSH_AUTH_SOCK" ]; then - ln -sf "$SSH_AUTH_SOCK" "$BYOBU_CONFIG_DIR/.ssh-agent" - export SSH_AUTH_SOCK="$BYOBU_CONFIG_DIR/.ssh-agent" -fi - -case $BYOBU_BACKEND in - tmux) - # Use 256 colors if possible - if $BYOBU_TEST tput >/dev/null; then - if [ "$(tput colors 2>/dev/null || echo 0)" = "256" ] || [ "$COLORTERM" = "gnome-terminal" ] || [ "$TERM" = "xterm" ] || [ "$TERM" = "xterm-256color" ]; then - [ -z "$SCREEN_TERM" ] && SCREEN_TERM="-2" - fi - fi - BYOBU_PROFILE="-f $BYOBU_PREFIX/share/$PKG/profiles/tmuxrc" - DEFAULT_WINDOW="new-session -n $BYOBU_WINDOW_NAME ${BYOBU_PREFIX}/bin/byobu-shell" - sessions=$($BYOBU_BACKEND list-sessions 2>/dev/null) || true - ;; - screen) - # Allow override of default window list, with BYOBU_WINDOWS environment variable - CUSTOM_WINDOW_SET=0 - if [ -s "$BYOBU_WINDOWS" ]; then - CUSTOM_WINDOW_SET=1 - elif [ -s "$BYOBU_CONFIG_DIR/windows.$BYOBU_WINDOWS" ]; then - CUSTOM_WINDOW_SET=1 - BYOBU_WINDOWS="$BYOBU_CONFIG_DIR/windows.$BYOBU_WINDOWS" - elif [ "$#" = "0" ]; then - BYOBU_WINDOWS="$BYOBU_CONFIG_DIR/windows" - else - BYOBU_WINDOWS="/dev/null" - fi - export BYOBU_WINDOWS - # Launch shell, unless the user has default windows set to launch - uncommented_lines < "$BYOBU_WINDOWS" && DEFAULT_WINDOW= || DEFAULT_WINDOW="${BYOBU_PREFIX}/bin/byobu-shell" - # Check if our terminfo supports 256 colors - if $BYOBU_TEST tput >/dev/null; then - if [ "$(tput colors 2>/dev/null || echo 0)" = "256" ]; then - SCREEN_TERM="-T screen-256color" - fi - fi - # Some users want to maintain separate configurations - # if they use both GNU Screen and byobu on the same system - if [ -r "$BYOBU_CONFIG_DIR/.screenrc" ]; then - BYOBU_PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/byoburc" - else - BYOBU_PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/screenrc" - fi - BYOBU_SESSION_NAME="-S $PKG" - # Zero out $BYOBU_SESSION_NAME if user has specified a session name - for i in "$@"; do - case $i in - -*r*|-*d*|-*D*|-*S*|-ls|-list) - BYOBU_SESSION_NAME= - ;; - esac - done - sessions=$($BYOBU_BACKEND -wipe 2>/dev/null) || true - ;; -esac - -# Save session info -[ -n "$DBUS_SESSION_BUS_ADDRESS" ] && printf "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS\n" > "$BYOBU_RUN_DIR/sockets" -[ -n "$SESSION_MANAGER" ] && printf "SESSION_MANAGER=$SESSION_MANAGER\n" >> "$BYOBU_RUN_DIR/sockets" - -# Now let's execute the backend! -if [ "$#" = "0" ]; then - if [ "$CUSTOM_WINDOW_SET" = "1" ]; then - # Start new custom window set session - case $BYOBU_BACKEND in - tmux) - exec tmux $SCREEN_TERM $BYOBU_PROFILE - ;; - screen) - exec screen $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE - ;; - esac - else - case "$sessions" in - *\(*\)*) - # Select and attach to an existing session - exec byobu-select-session - ;; - *) - # Start new default session - case $BYOBU_BACKEND in - tmux) - exec tmux $SCREEN_TERM $BYOBU_PROFILE $DEFAULT_WINDOW - ;; - screen) - exec screen $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $DEFAULT_WINDOW - ;; - esac - ;; - esac - fi -else - # Launch with command line args - case $BYOBU_BACKEND in - tmux) - exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_PROFILE "$@" - ;; - screen) - exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE "$@" - ;; - esac -fi - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-config byobu-5.74/usr/bin/byobu-config --- byobu-5.73/usr/bin/byobu-config 2013-12-17 01:48:21.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-config 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#!/bin/sh -e -# -# byobu-config - interactive byobu configuration wrapper script -# Copyright (C) 2013 Dustin Kirkland -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/config.py" diff -Nru byobu-5.73/usr/bin/byobu-config.in byobu-5.74/usr/bin/byobu-config.in --- byobu-5.73/usr/bin/byobu-config.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-config.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,24 @@ +#!/bin/sh -e +# +# byobu-config - interactive byobu configuration wrapper script +# Copyright (C) 2013 Dustin Kirkland +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/config.py" diff -Nru byobu-5.73/usr/bin/byobu-ctrl-a byobu-5.74/usr/bin/byobu-ctrl-a --- byobu-5.73/usr/bin/byobu-ctrl-a 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-ctrl-a 1970-01-01 00:00:00.000000000 +0000 @@ -1,150 +0,0 @@ -#!/bin/sh -# -# byobu-ctrl-a - set the ctrl-a behavior -# Copyright (C) 2011 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -Usage() { - cat <&2; exit 1;; -esac - -if [ "${2}" ]; then - KEY=$(printf "$2" | $BYOBU_SED 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/') - key=$(printf "$2" | $BYOBU_SED 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/') -else - KEY="A" - key="a" -fi - -while [ -z "$bind_to" ]; do - echo - echo "Configure Byobu's ctrl-a behavior..." - echo - echo "When you press ctrl-a in Byobu, do you want it to operate in:" - echo " (1) Screen mode (GNU Screen's default escape sequence)" - echo " (2) Emacs mode (go to beginning of line)" - echo - echo "Note that:" - echo " - F12 also operates as an escape in Byobu" - echo " - You can press F9 and choose your escape character" - echo " - You can run 'byobu-ctrl-a' at any time to change your selection" - echo - printf "Select [1 or 2]: " - s=$(head -n1) - echo - case "$s" in - 1) bind_to="screen"; break;; - 2) bind_to="emacs"; break;; - esac -done - -case "$bind_to" in - emacs) - case "$BYOBU_BACKEND" in - screen) - $BYOBU_SED -i -e "/^register x /d" -e "/^bindkey /d" -e "/^escape /d" "$keybindings" - echo "bindkey \"^${KEY}\"" >> "$keybindings" - $BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile" - ;; - tmux) - $BYOBU_SED -i -e "/^set -g prefix/d" -e "/ send-prefix/d" -e "/^unbind-key -n C-${key}/d" "$keybindings" - echo "set -g prefix F12" >> "$keybindings" - echo "unbind-key -n C-${key}" >> "$keybindings" - $BYOBU_BACKEND source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc" - ;; - esac - echo "INFO: ctrl-a will now operate in emacs mode" - ;; - screen) - case "$BYOBU_BACKEND" in - screen) - $BYOBU_SED -i -e "/^register x /d" -e "/^bindkey \"^\"/d" -e "/^escape /d" "$keybindings" - echo "escape \"^${KEY}${key}\"" >> "$keybindings" - echo "register x \"^${KEY}\"" >> "$keybindings" - echo "bindkey \"^${KEY}\"" >> "$keybindings" - $BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile" - ;; - tmux) - $BYOBU_SED -i -e "/^set -g prefix/d" -e "/ send-prefix/d" -e "/^unbind-key -n C-${key}/d" "$keybindings" - echo "unbind-key -n C-${key}" >> "$keybindings" - if $BYOBU_BACKEND -V | grep " 1.5"; then - # tmux 1.5 supports a list of prefixes - echo "set -g prefix ^${KEY},F12" >> "$keybindings" - else - # tmux 1.6 and above supports prefix and prefix2 - echo "set -g prefix ^${KEY}" >> "$keybindings" - echo "set -g prefix2 ^${KEY}" >> "$keybindings" - fi - echo "bind ${key} send-prefix" >> "$keybindings" - $BYOBU_BACKEND source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc" - ;; - esac - echo "INFO: ctrl-a will now operate in GNU Screen mode" - ;; - *) - echo "Error: bad value for binding: $bind_to" - ;; -esac - -if [ -z "${2}" ]; then - echo "To modify this behavior again later, run 'byobu-ctrl-a'" - echo -fi - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-ctrl-a.in byobu-5.74/usr/bin/byobu-ctrl-a.in --- byobu-5.73/usr/bin/byobu-ctrl-a.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-ctrl-a.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,150 @@ +#!/bin/sh +# +# byobu-ctrl-a - set the ctrl-a behavior +# Copyright (C) 2011 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +Usage() { + cat <&2; exit 1;; +esac + +if [ "${2}" ]; then + KEY=$(printf "$2" | $BYOBU_SED 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/') + key=$(printf "$2" | $BYOBU_SED 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/') +else + KEY="A" + key="a" +fi + +while [ -z "$bind_to" ]; do + echo + echo "Configure Byobu's ctrl-a behavior..." + echo + echo "When you press ctrl-a in Byobu, do you want it to operate in:" + echo " (1) Screen mode (GNU Screen's default escape sequence)" + echo " (2) Emacs mode (go to beginning of line)" + echo + echo "Note that:" + echo " - F12 also operates as an escape in Byobu" + echo " - You can press F9 and choose your escape character" + echo " - You can run 'byobu-ctrl-a' at any time to change your selection" + echo + printf "Select [1 or 2]: " + s=$(head -n1) + echo + case "$s" in + 1) bind_to="screen"; break;; + 2) bind_to="emacs"; break;; + esac +done + +case "$bind_to" in + emacs) + case "$BYOBU_BACKEND" in + screen) + $BYOBU_SED -i -e "/^register x /d" -e "/^bindkey /d" -e "/^escape /d" "$keybindings" + echo "bindkey \"^${KEY}\"" >> "$keybindings" + $BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile" + ;; + tmux) + $BYOBU_SED -i -e "/^set -g prefix/d" -e "/ send-prefix/d" -e "/^unbind-key -n C-${key}/d" "$keybindings" + echo "set -g prefix F12" >> "$keybindings" + echo "unbind-key -n C-${key}" >> "$keybindings" + $BYOBU_BACKEND source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc" + ;; + esac + echo "INFO: ctrl-a will now operate in emacs mode" + ;; + screen) + case "$BYOBU_BACKEND" in + screen) + $BYOBU_SED -i -e "/^register x /d" -e "/^bindkey \"^\"/d" -e "/^escape /d" "$keybindings" + echo "escape \"^${KEY}${key}\"" >> "$keybindings" + echo "register x \"^${KEY}\"" >> "$keybindings" + echo "bindkey \"^${KEY}\"" >> "$keybindings" + $BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile" + ;; + tmux) + $BYOBU_SED -i -e "/^set -g prefix/d" -e "/ send-prefix/d" -e "/^unbind-key -n C-${key}/d" "$keybindings" + echo "unbind-key -n C-${key}" >> "$keybindings" + if $BYOBU_BACKEND -V | grep " 1.5"; then + # tmux 1.5 supports a list of prefixes + echo "set -g prefix ^${KEY},F12" >> "$keybindings" + else + # tmux 1.6 and above supports prefix and prefix2 + echo "set -g prefix ^${KEY}" >> "$keybindings" + echo "set -g prefix2 ^${KEY}" >> "$keybindings" + fi + echo "bind ${key} send-prefix" >> "$keybindings" + $BYOBU_BACKEND source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc" + ;; + esac + echo "INFO: ctrl-a will now operate in GNU Screen mode" + ;; + *) + echo "Error: bad value for binding: $bind_to" + ;; +esac + +if [ -z "${2}" ]; then + echo "To modify this behavior again later, run 'byobu-ctrl-a'" + echo +fi + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-disable byobu-5.74/usr/bin/byobu-disable --- byobu-5.73/usr/bin/byobu-disable 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-disable 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -#!/bin/sh -e -# -# byobu-disable: disable byobu at login -# Copyright (C) 2010 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -byobu-launcher-uninstall - -echo -echo "The Byobu window manager will no longer be launched automatically at login." -echo -echo "To re-enable this behavior later, just run:" -echo " byobu-enable" -echo - -# If we're in a byobu session, let's exit that too -case "$STY" in - *byobu) - $BYOBU_BACKEND -X at 0 quit - ;; -esac - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-disable.in byobu-5.74/usr/bin/byobu-disable.in --- byobu-5.73/usr/bin/byobu-disable.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-disable.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,41 @@ +#!/bin/sh -e +# +# byobu-disable: disable byobu at login +# Copyright (C) 2010 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +byobu-launcher-uninstall + +echo +echo "The Byobu window manager will no longer be launched automatically at login." +echo +echo "To re-enable this behavior later, just run:" +echo " byobu-enable" +echo + +# If we're in a byobu session, let's exit that too +case "$STY" in + *byobu) + $BYOBU_BACKEND -X at 0 quit + ;; +esac + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-disable-prompt byobu-5.74/usr/bin/byobu-disable-prompt --- byobu-5.73/usr/bin/byobu-disable-prompt 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-disable-prompt 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -#!/bin/sh -e -# -# byobu-disable-prompt -# Copyright (C) 2013 Dustin Kirkland -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -$BYOBU_SED -i -e "/#byobu-prompt#$/d" "$HOME/.bashrc" - -if [ "$1" != "--no-reload" ]; then - if [ -n "$TMUX" ] && [ "$SHELL" = "/bin/bash" ]; then - tmux send-keys " . ~/.bashrc" \; send-keys Enter - else - echo - echo "You will need to reload your shell configuration for this to take effect..." - echo " . ~/.bashrc" - echo - fi -fi - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-disable-prompt.in byobu-5.74/usr/bin/byobu-disable-prompt.in --- byobu-5.73/usr/bin/byobu-disable-prompt.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-disable-prompt.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,38 @@ +#!/bin/sh -e +# +# byobu-disable-prompt +# Copyright (C) 2013 Dustin Kirkland +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +$BYOBU_SED -i -e "/#byobu-prompt#$/d" "$HOME/.bashrc" + +if [ "$1" != "--no-reload" ]; then + if [ -n "$TMUX" ] && [ "$SHELL" = "/bin/bash" ]; then + tmux send-keys " . ~/.bashrc" \; send-keys Enter + else + echo + echo "You will need to reload your shell configuration for this to take effect..." + echo " . ~/.bashrc" + echo + fi +fi + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-enable byobu-5.74/usr/bin/byobu-enable --- byobu-5.73/usr/bin/byobu-enable 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-enable 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -#!/bin/sh -e -# -# byobu-enable: enable and launch byobu -# Copyright (C) 2010 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -byobu-launcher-install - -echo -echo "The Byobu window manager will be launched automatically at each text login." -echo -echo "To disable this behavior later, just run:" -echo " byobu-disable" -echo -printf "Press to continue..." -$(head -n1) - -exec byobu - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-enable.in byobu-5.74/usr/bin/byobu-enable.in --- byobu-5.73/usr/bin/byobu-enable.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-enable.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,38 @@ +#!/bin/sh -e +# +# byobu-enable: enable and launch byobu +# Copyright (C) 2010 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +byobu-launcher-install + +echo +echo "The Byobu window manager will be launched automatically at each text login." +echo +echo "To disable this behavior later, just run:" +echo " byobu-disable" +echo +printf "Press to continue..." +$(head -n1) + +exec byobu + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-enable-prompt byobu-5.74/usr/bin/byobu-enable-prompt --- byobu-5.73/usr/bin/byobu-enable-prompt 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-enable-prompt 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -#!/bin/sh -e -# -# byobu-enable-prompt -# Copyright (C) 2013 Dustin Kirkland -# -# Authors: Dustin Kirkland -# -# 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 . - -[ "$SHELL" = "/bin/bash" ] || exit 1 - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - - -prompt="${BYOBU_CONFIG_DIR}/prompt" -printf ". ${BYOBU_PREFIX}/share/${PKG}/profiles/bashrc #byobu-prompt#\n" > "$prompt" -$PKG-disable-prompt --no-reload "$1" || true -printf "[ -r $prompt ] && . $prompt #byobu-prompt#\n" >> "$HOME/.bashrc" - -if [ -n "$TMUX" ]; then - tmux send-keys " . ~/.bashrc" \; send-keys Enter -else - echo - echo "You will need to reload your shell configuration for this to take effect..." - echo " . ~/.bashrc" - echo -fi - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-enable-prompt.in byobu-5.74/usr/bin/byobu-enable-prompt.in --- byobu-5.73/usr/bin/byobu-enable-prompt.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-enable-prompt.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,42 @@ +#!/bin/sh -e +# +# byobu-enable-prompt +# Copyright (C) 2013 Dustin Kirkland +# +# Authors: Dustin Kirkland +# +# 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 . + +[ "$SHELL" = "/bin/bash" ] || exit 1 + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + + +prompt="${BYOBU_CONFIG_DIR}/prompt" +printf ". ${BYOBU_PREFIX}/share/${PKG}/profiles/bashrc #byobu-prompt#\n" > "$prompt" +$PKG-disable-prompt --no-reload "$1" || true +printf "[ -r $prompt ] && . $prompt #byobu-prompt#\n" >> "$HOME/.bashrc" + +if [ -n "$TMUX" ]; then + tmux send-keys " . ~/.bashrc" \; send-keys Enter +else + echo + echo "You will need to reload your shell configuration for this to take effect..." + echo " . ~/.bashrc" + echo +fi + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-export byobu-5.74/usr/bin/byobu-export --- byobu-5.73/usr/bin/byobu-export 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-export 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -#!/bin/sh -e -# -# byobu-export -# Copyright (C) 2008-2010 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -gettext " -The byobu-export utility is now deprecated. - -To install byobu on a system for which byobu is not packaged, or -where you are not the root user, simply: - * Download the latest release (>= 3.0) from: - https://launchpad.net/byobu/+download - * And follow the instructions in the README - -" - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-export.in byobu-5.74/usr/bin/byobu-export.in --- byobu-5.73/usr/bin/byobu-export.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-export.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,36 @@ +#!/bin/sh -e +# +# byobu-export +# Copyright (C) 2008-2010 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +gettext " +The byobu-export utility is now deprecated. + +To install byobu on a system for which byobu is not packaged, or +where you are not the root user, simply: + * Download the latest release (>= 3.0) from: + https://launchpad.net/byobu/+download + * And follow the instructions in the README + +" + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu.in byobu-5.74/usr/bin/byobu.in --- byobu-5.73/usr/bin/byobu.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,208 @@ +#!/bin/sh -e +# +# byobu - wrapper script +# Copyright (C) 2008-2009 Canonical Ltd. +# Copyright (C) 2008-2013 Dustin Kirkland +# +# Authors: Dustin Kirkland +# +# 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 . + +VERSION=5.74 +PKG="byobu" + +# All sorts of things go wrong if you don't own your $HOME dir. +# This happens under sudo, if you don't use the -H option; Byobu will +# create a bunch of files in your $HOME which will be owned by root. +if [ ! -O "$HOME" ]; then + echo "Cannot run $PKG because [$USER] does not own [$HOME]" 1>&2 + if [ -n "$SUDO_USER" ]; then + echo "To run $PKG under sudo, you MUST use 'sudo -H'" 1>&2 + fi + exit 1 +fi + +# Source local byobu config +if [ -r "$HOME/.byoburc" ]; then + # Ensure that this configuration is usable + . "$HOME/.byoburc" || mv -f "$HOME/.byoburc".orig +fi +if [ -z "${BYOBU_PREFIX}" ]; then + # Find and export the installation location prefix + greadlink -f . >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink" + prefix="$(dirname $(dirname $($BYOBU_READLINK -f $0)))" + if [ "$prefix" != "@prefix@" ]; then + echo "export BYOBU_PREFIX='$prefix'" >> "$HOME/.byoburc" + . "$HOME/.byoburc" + fi +fi +export BYOBU_CHARMAP=$(locale charmap) +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +# Override backend if we can determine intentions from argv[0] +[ -r "$HOME/.$PKG/backend" ] && . "$HOME/.$PKG/backend" +case "$0" in + *byobu-screen) BYOBU_BACKEND="screen" ;; + *byobu-tmux) BYOBU_BACKEND="tmux" ;; +esac + +# At this point, we're sure BYOBU_BACKEND is properly defined +export BYOBU_BACKEND + +# Store the parent tty +export BYOBU_TTY=$(tty) + +# Get the default window name +[ -n "$BYOBU_WINDOW_NAME" ] || BYOBU_WINDOW_NAME=- + +# Add a version argument for debugging purposes +if [ "$#" = "1" ]; then + case "$1" in + -v|--version) + echo "$PKG version $VERSION" + if $BYOBU_TEST bash >/dev/null 2>&1; then + # Check ulimits + u=$(bash -c "ulimit -n") + [ "$u" = "unlimited" ] || [ $u -ge 15 ] || echo "WARNING: ulimit -n is too low" 1>&2 + u=$(bash -c "ulimit -u") + [ "$u" = "unlimited" ] || [ $u -ge 1600 ] || echo "WARNING: ulimit -u is too low" 1>&2 + fi + exec $BYOBU_BACKEND $BYOBU_ARG_VERSION + exit 0 + ;; + esac +fi + +# Check if we're being autolaunched, and this user explicitly does not want it. +if [ "$0" = "/etc/profile.d/Z98-$PKG.sh" ] && [ -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then + exit 0 +fi + +# Sanitize the environment +byobu-janitor --force + +# Set the window title +[ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc" +. $BYOBU_PREFIX/lib/$PKG/ip_address +[ -n "$BYOBU_NO_TITLE" ] || printf "\033]0;${USER}@$(hostname) ($(__ip_address t)) - ${PKG}\007" + +# Drop a symlink to the ssh socket in $HOME, since we can ensure that exists +if [ -S "$SSH_AUTH_SOCK" ] && [ ! -h "$SSH_AUTH_SOCK" ]; then + ln -sf "$SSH_AUTH_SOCK" "$BYOBU_CONFIG_DIR/.ssh-agent" + export SSH_AUTH_SOCK="$BYOBU_CONFIG_DIR/.ssh-agent" +fi + +case $BYOBU_BACKEND in + tmux) + # Use 256 colors if possible + if $BYOBU_TEST tput >/dev/null; then + if [ "$(tput colors 2>/dev/null || echo 0)" = "256" ] || [ "$COLORTERM" = "gnome-terminal" ] || [ "$TERM" = "xterm" ] || [ "$TERM" = "xterm-256color" ]; then + [ -z "$SCREEN_TERM" ] && SCREEN_TERM="-2" + fi + fi + BYOBU_PROFILE="-f $BYOBU_PREFIX/share/$PKG/profiles/tmuxrc" + DEFAULT_WINDOW="new-session -n $BYOBU_WINDOW_NAME ${BYOBU_PREFIX}/bin/byobu-shell" + sessions=$($BYOBU_BACKEND list-sessions 2>/dev/null) || true + ;; + screen) + # Allow override of default window list, with BYOBU_WINDOWS environment variable + CUSTOM_WINDOW_SET=0 + if [ -s "$BYOBU_WINDOWS" ]; then + CUSTOM_WINDOW_SET=1 + elif [ -s "$BYOBU_CONFIG_DIR/windows.$BYOBU_WINDOWS" ]; then + CUSTOM_WINDOW_SET=1 + BYOBU_WINDOWS="$BYOBU_CONFIG_DIR/windows.$BYOBU_WINDOWS" + elif [ "$#" = "0" ]; then + BYOBU_WINDOWS="$BYOBU_CONFIG_DIR/windows" + else + BYOBU_WINDOWS="/dev/null" + fi + export BYOBU_WINDOWS + # Launch shell, unless the user has default windows set to launch + uncommented_lines < "$BYOBU_WINDOWS" && DEFAULT_WINDOW= || DEFAULT_WINDOW="${BYOBU_PREFIX}/bin/byobu-shell" + # Check if our terminfo supports 256 colors + if $BYOBU_TEST tput >/dev/null; then + if [ "$(tput colors 2>/dev/null || echo 0)" = "256" ]; then + SCREEN_TERM="-T screen-256color" + fi + fi + # Some users want to maintain separate configurations + # if they use both GNU Screen and byobu on the same system + if [ -r "$BYOBU_CONFIG_DIR/.screenrc" ]; then + BYOBU_PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/byoburc" + else + BYOBU_PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/screenrc" + fi + BYOBU_SESSION_NAME="-S $PKG" + # Zero out $BYOBU_SESSION_NAME if user has specified a session name + for i in "$@"; do + case $i in + -*r*|-*d*|-*D*|-*S*|-ls|-list) + BYOBU_SESSION_NAME= + ;; + esac + done + sessions=$($BYOBU_BACKEND -wipe 2>/dev/null) || true + ;; +esac + +# Save session info +[ -n "$DBUS_SESSION_BUS_ADDRESS" ] && printf "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS\n" > "$BYOBU_RUN_DIR/sockets" +[ -n "$SESSION_MANAGER" ] && printf "SESSION_MANAGER=$SESSION_MANAGER\n" >> "$BYOBU_RUN_DIR/sockets" + +# Now let's execute the backend! +if [ "$#" = "0" ]; then + if [ "$CUSTOM_WINDOW_SET" = "1" ]; then + # Start new custom window set session + case $BYOBU_BACKEND in + tmux) + exec tmux $SCREEN_TERM $BYOBU_PROFILE + ;; + screen) + exec screen $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE + ;; + esac + else + case "$sessions" in + *\(*\)*) + # Select and attach to an existing session + exec byobu-select-session + ;; + *) + # Start new default session + case $BYOBU_BACKEND in + tmux) + exec tmux $SCREEN_TERM $BYOBU_PROFILE $DEFAULT_WINDOW + ;; + screen) + exec screen $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $DEFAULT_WINDOW + ;; + esac + ;; + esac + fi +else + # Launch with command line args + case $BYOBU_BACKEND in + tmux) + exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_PROFILE "$@" + ;; + screen) + exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE "$@" + ;; + esac +fi + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-janitor byobu-5.74/usr/bin/byobu-janitor --- byobu-5.73/usr/bin/byobu-janitor 2014-02-09 14:10:53.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-janitor 1970-01-01 00:00:00.000000000 +0000 @@ -1,131 +0,0 @@ -#!/bin/sh -e -# -# byobu-janitor - a collection of byobu tasks that ensure a clean -# environtment and smooth upgrades -# -# Copyright (C) 2009 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -# Ensure that all updates get run immediately -rm -rf "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND" - -# Ensure that we re-check metadata service -rm -f "$BYOBU_CONFIG_DIR/.metadata_available" "$BYOBU_RUN_DIR/.metadata_available" - -# Exit immediately, if we're not forced, and there is no reload flag -FLAG="$BYOBU_RUN_DIR/reload-required" -if [ "$1" != "--force" ] && [ ! -e "$FLAG" ]; then - exit 0 -fi - -# Set the rest of the variables -DEFAULT_PROFILE="light" -PROFILE="$BYOBU_CONFIG_DIR/profile" - -# Create byobu-exchange buffer file, with secure permissions, if it doesn't exist -[ -e "$BYOBU_RUN_DIR/printscreen" ] || install -m 600 /dev/null "$BYOBU_RUN_DIR/printscreen" - -# Affects: users who launched using sudo, such that their config dir -# is not writable by them -if [ -d "$BYOBU_CONFIG_DIR" ] && [ ! -w "$BYOBU_CONFIG_DIR" ]; then - echo "ERROR: [$BYOBU_CONFIG_DIR] is not writable by the current user" 1>&2 - exit 1 -fi - -# Affects: Upgrades from <= byobu 4.30 -# Clear out old style status configuration -if ! grep -qs "^screen_upper_left=" "$BYOBU_CONFIG_DIR/status"; then - rm -f "$BYOBU_CONFIG_DIR/status" "$BYOBU_CONFIG_DIR/statusrc" -fi - -# NOTE: Older version of Screen have an arbitrary limit of only being able -# to change colors 16 times in this 'hardstatus string'. -# Also committed in Upstream git, but not yet released. -# * http://savannah.gnu.org/bugs/?22146 -# If we could reliably tell if we had a patched screen, we'd do so here... -MC=0 - -# Affects: First runs with no configuration -# Seed the configuration -# Setup initial local user configuration -[ -r "$BYOBU_CONFIG_DIR/color" ] || printf "BACKGROUND=k\nFOREGROUND=w\nMONOCHROME=$MC" > "$BYOBU_CONFIG_DIR/color" -[ -r "$BYOBU_CONFIG_DIR/color.tmux" ] || printf "BYOBU_DARK=black\nBYOBU_LIGHT=white\nBYOBU_ACCENT=magenta\nBYOBU_HIGHLIGHT=red\nMONOCHROME=$MC" > "$BYOBU_CONFIG_DIR/color.tmux" -[ -r "$BYOBU_CONFIG_DIR/datetime.tmux" ] || printf 'BYOBU_DATE="%%Y-%%m-%%d "\nBYOBU_TIME="%%H:%%M:%%S"\n' > "$BYOBU_CONFIG_DIR/datetime.tmux" -[ -r "$BYOBU_CONFIG_DIR/profile" ] || echo "source \$BYOBU_PREFIX/share/$PKG/profiles/common" > "$BYOBU_CONFIG_DIR/profile" -[ -r "$BYOBU_CONFIG_DIR/profile.tmux" ] || echo "source \$BYOBU_PREFIX/share/$PKG/profiles/tmux" > "$BYOBU_CONFIG_DIR/profile.tmux" -[ -r "$BYOBU_CONFIG_DIR/keybindings" ] || echo "source \$BYOBU_PREFIX/share/$PKG/keybindings/common" > "$BYOBU_CONFIG_DIR/keybindings" -[ -r "$BYOBU_CONFIG_DIR/keybindings.tmux" ] || touch "$BYOBU_CONFIG_DIR/keybindings.tmux" -[ -r "$BYOBU_CONFIG_DIR/windows" ] || touch "$BYOBU_CONFIG_DIR/windows" -[ -r "$BYOBU_CONFIG_DIR/backend" ] || echo "BYOBU_BACKEND=$BYOBU_BACKEND" > "$BYOBU_CONFIG_DIR/backend" -[ -r "$BYOBU_CONFIG_DIR/.screenrc" ] || touch "$BYOBU_CONFIG_DIR/.screenrc" -[ -r "$BYOBU_CONFIG_DIR/.tmux.conf" ] || touch "$BYOBU_CONFIG_DIR/.tmux.conf" -for f in status statusrc; do - if [ ! -r "$BYOBU_CONFIG_DIR/$f" ]; then - # Copy from skeleton, if possible - cp -f "$BYOBU_PREFIX/share/$PKG/status/$f" "$BYOBU_CONFIG_DIR/$f" - # Enable ec2_cost, if we're in ec2 and seeding a new setup - if metadata_available; then - $BYOBU_SED -i -e "s/#ec2_cost/ec2_cost/g" "$($BYOBU_READLINK -f $BYOBU_CONFIG_DIR/$f)" - fi - fi -done - -# Affects: Upgrades from <= byobu-2.70 that autolaunch -# Update the byobu-launch line, if necessary -if grep -qs " $PKG-launch$" "$HOME"/.profile; then - $PKG-launcher-install -fi - -# Affects: Upgrades from <= byobu-2.78 which might have "motd+shell" -# in their window list; update this to just "shell" -if grep -qs "motd+shell" "$BYOBU_CONFIG_DIR/windows"; then - $BYOBU_SED -i -e "s/motd+shell/shell/g" "$($BYOBU_READLINK -f $BYOBU_CONFIG_DIR/windows)" || true -fi - -# Affects: Upgrades from <= byobu 4.3, remove ec2_rates -rm -f "$BYOBU_CONFIG_DIR/ec2_rates" - -# Affects: Upgrades from <= byobu 4.4, update "shell" -> "byobu-shell" -if grep -qs " shell$" "$BYOBU_CONFIG_DIR/windows"; then - $BYOBU_SED -i -e "s/ shell$/ $PKG-shell/g" "$($BYOBU_READLINK -f $BYOBU_CONFIG_DIR/windows)" || true -fi - -# Affects: Upgrades from <= byobu 4.22 -killall -u $USER byobu-statusd >/dev/null 2>&1 || true - -# Clean up flag (new and old) -rm -f "$FLAG" "/var/run/screen/S-$USER/$PKG.reload-required" - -# Affects: Upgrades from <= byobu 5.50, install byobu prompt if using stock bashrc -if ! (grep -qs "#byobu-prompt#$" "$HOME/.bashrc") && ! [ -e "$BYOBU_CONFIG_DIR/prompt" ]; then - if $BYOBU_TEST diff >/dev/null 2>&1; then - if diff /etc/skel/.bashrc "$HOME/.bashrc" >/dev/null 2>&1; then - printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt #byobu-prompt#\n" >> "$HOME/.bashrc" - fi - elif $BYOBU_TEST md5sum >/dev/null 2>&1; then - if [ "$(cat /etc/skel/.bashrc | md5sum)" = "$(cat $HOME/.bashrc | md5sum)" ]; then - printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt #byobu-prompt#\n" >> "$HOME/.bashrc" - fi - fi -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" - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-janitor.in byobu-5.74/usr/bin/byobu-janitor.in --- byobu-5.73/usr/bin/byobu-janitor.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-janitor.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,131 @@ +#!/bin/sh -e +# +# byobu-janitor - a collection of byobu tasks that ensure a clean +# environtment and smooth upgrades +# +# Copyright (C) 2009 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +# Ensure that all updates get run immediately +rm -rf "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND" + +# Ensure that we re-check metadata service +rm -f "$BYOBU_CONFIG_DIR/.metadata_available" "$BYOBU_RUN_DIR/.metadata_available" + +# Exit immediately, if we're not forced, and there is no reload flag +FLAG="$BYOBU_RUN_DIR/reload-required" +if [ "$1" != "--force" ] && [ ! -e "$FLAG" ]; then + exit 0 +fi + +# Set the rest of the variables +DEFAULT_PROFILE="light" +PROFILE="$BYOBU_CONFIG_DIR/profile" + +# Create byobu-exchange buffer file, with secure permissions, if it doesn't exist +[ -e "$BYOBU_RUN_DIR/printscreen" ] || install -m 600 /dev/null "$BYOBU_RUN_DIR/printscreen" + +# Affects: users who launched using sudo, such that their config dir +# is not writable by them +if [ -d "$BYOBU_CONFIG_DIR" ] && [ ! -w "$BYOBU_CONFIG_DIR" ]; then + echo "ERROR: [$BYOBU_CONFIG_DIR] is not writable by the current user" 1>&2 + exit 1 +fi + +# Affects: Upgrades from <= byobu 4.30 +# Clear out old style status configuration +if ! grep -qs "^screen_upper_left=" "$BYOBU_CONFIG_DIR/status"; then + rm -f "$BYOBU_CONFIG_DIR/status" "$BYOBU_CONFIG_DIR/statusrc" +fi + +# NOTE: Older version of Screen have an arbitrary limit of only being able +# to change colors 16 times in this 'hardstatus string'. +# Also committed in Upstream git, but not yet released. +# * http://savannah.gnu.org/bugs/?22146 +# If we could reliably tell if we had a patched screen, we'd do so here... +MC=0 + +# Affects: First runs with no configuration +# Seed the configuration +# Setup initial local user configuration +[ -r "$BYOBU_CONFIG_DIR/color" ] || printf "BACKGROUND=k\nFOREGROUND=w\nMONOCHROME=$MC" > "$BYOBU_CONFIG_DIR/color" +[ -r "$BYOBU_CONFIG_DIR/color.tmux" ] || printf "BYOBU_DARK=black\nBYOBU_LIGHT=white\nBYOBU_ACCENT=magenta\nBYOBU_HIGHLIGHT=red\nMONOCHROME=$MC" > "$BYOBU_CONFIG_DIR/color.tmux" +[ -r "$BYOBU_CONFIG_DIR/datetime.tmux" ] || printf 'BYOBU_DATE="%%Y-%%m-%%d "\nBYOBU_TIME="%%H:%%M:%%S"\n' > "$BYOBU_CONFIG_DIR/datetime.tmux" +[ -r "$BYOBU_CONFIG_DIR/profile" ] || echo "source \$BYOBU_PREFIX/share/$PKG/profiles/common" > "$BYOBU_CONFIG_DIR/profile" +[ -r "$BYOBU_CONFIG_DIR/profile.tmux" ] || echo "source \$BYOBU_PREFIX/share/$PKG/profiles/tmux" > "$BYOBU_CONFIG_DIR/profile.tmux" +[ -r "$BYOBU_CONFIG_DIR/keybindings" ] || echo "source \$BYOBU_PREFIX/share/$PKG/keybindings/common" > "$BYOBU_CONFIG_DIR/keybindings" +[ -r "$BYOBU_CONFIG_DIR/keybindings.tmux" ] || touch "$BYOBU_CONFIG_DIR/keybindings.tmux" +[ -r "$BYOBU_CONFIG_DIR/windows" ] || touch "$BYOBU_CONFIG_DIR/windows" +[ -r "$BYOBU_CONFIG_DIR/backend" ] || echo "BYOBU_BACKEND=$BYOBU_BACKEND" > "$BYOBU_CONFIG_DIR/backend" +[ -r "$BYOBU_CONFIG_DIR/.screenrc" ] || touch "$BYOBU_CONFIG_DIR/.screenrc" +[ -r "$BYOBU_CONFIG_DIR/.tmux.conf" ] || touch "$BYOBU_CONFIG_DIR/.tmux.conf" +for f in status statusrc; do + if [ ! -r "$BYOBU_CONFIG_DIR/$f" ]; then + # Copy from skeleton, if possible + cp -f "$BYOBU_PREFIX/share/$PKG/status/$f" "$BYOBU_CONFIG_DIR/$f" + # Enable ec2_cost, if we're in ec2 and seeding a new setup + if metadata_available; then + $BYOBU_SED -i -e "s/#ec2_cost/ec2_cost/g" "$($BYOBU_READLINK -f $BYOBU_CONFIG_DIR/$f)" + fi + fi +done + +# Affects: Upgrades from <= byobu-2.70 that autolaunch +# Update the byobu-launch line, if necessary +if grep -qs " $PKG-launch$" "$HOME"/.profile; then + $PKG-launcher-install +fi + +# Affects: Upgrades from <= byobu-2.78 which might have "motd+shell" +# in their window list; update this to just "shell" +if grep -qs "motd+shell" "$BYOBU_CONFIG_DIR/windows"; then + $BYOBU_SED -i -e "s/motd+shell/shell/g" "$($BYOBU_READLINK -f $BYOBU_CONFIG_DIR/windows)" || true +fi + +# Affects: Upgrades from <= byobu 4.3, remove ec2_rates +rm -f "$BYOBU_CONFIG_DIR/ec2_rates" + +# Affects: Upgrades from <= byobu 4.4, update "shell" -> "byobu-shell" +if grep -qs " shell$" "$BYOBU_CONFIG_DIR/windows"; then + $BYOBU_SED -i -e "s/ shell$/ $PKG-shell/g" "$($BYOBU_READLINK -f $BYOBU_CONFIG_DIR/windows)" || true +fi + +# Affects: Upgrades from <= byobu 4.22 +killall -u $USER byobu-statusd >/dev/null 2>&1 || true + +# Clean up flag (new and old) +rm -f "$FLAG" "/var/run/screen/S-$USER/$PKG.reload-required" + +# Affects: Upgrades from <= byobu 5.50, install byobu prompt if using stock bashrc +if ! (grep -qs "#byobu-prompt#$" "$HOME/.bashrc") && ! [ -e "$BYOBU_CONFIG_DIR/prompt" ]; then + if $BYOBU_TEST diff >/dev/null 2>&1; then + if diff /etc/skel/.bashrc "$HOME/.bashrc" >/dev/null 2>&1; then + printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt #byobu-prompt#\n" >> "$HOME/.bashrc" + fi + elif $BYOBU_TEST md5sum >/dev/null 2>&1; then + if [ "$(cat /etc/skel/.bashrc | md5sum)" = "$(cat $HOME/.bashrc | md5sum)" ]; then + printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt #byobu-prompt#\n" >> "$HOME/.bashrc" + fi + fi +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" + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-keybindings byobu-5.74/usr/bin/byobu-keybindings --- byobu-5.73/usr/bin/byobu-keybindings 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-keybindings 2014-02-28 23:33:33.000000000 +0000 @@ -20,7 +20,7 @@ case "$BYOBU_BACKEND" in "tmux") - enabled=$(tmux list-keys | grep "f-keys.tmux.disable$") + enabled=$(tmux list-keys | grep "f-keys.tmux.disable ;") if [ -n "$enabled" ]; then tmux source "$BYOBU_PREFIX/share/byobu/keybindings/f-keys.tmux.disable" echo "Byobu keybindings: [OFF]" diff -Nru byobu-5.73/usr/bin/byobu-launch byobu-5.74/usr/bin/byobu-launch --- byobu-5.73/usr/bin/byobu-launch 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-launch 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -#!/bin/sh -e -# -# byobu-launch - call the launcher if we're in an interactive shell -# Copyright (C) 2010 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -# 1) Prevent recursion, and multiple sourcing of profiles with the BYOBU_SOURCED_PROFILE environment variable. -# 2) Respect environment variables (LC_BYOBU and BYOBU_DISABLE) passable over SSH to disable -# Byobu launch. This puts that configurability on the SSH client, -# in addition to the server. -# To use over SSH, your /etc/ssh/sshd_config and /etc/ssh/ssh_config -# must pass this variable with AcceptEnv and SendEnv. -# Note that LC_* are passed by default on Debian/Ubuntu, we'll optionally -# support LC_BYOBU=0 -# And in your local bashrc: -# $HOME/.bashrc: export LC_BYOBU=0 -# or edit your sshd_config, ssh_config, and set: -# $HOME/.bashrc: export BYOBU_DISABLE=1 - -_tty=$(tty) -if [ "${_tty#/dev/ttyS}" != "$_tty" ]; then - # Don't autolaunch byobu on serial consoles - # You can certainly run 'byobu' manually, though - echo - echo "INFO: Disabling auto-launch of Byobu on this serial console" - echo "INFO: You can still run 'byobu' manually at the command line" - echo -elif [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_DISABLE" != "1" ] && [ -O "$HOME" ]; then - unset _tty - BYOBU_SOURCED_PROFILE=1 - PKG="byobu" - [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" - [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX - . "${BYOBU_PREFIX}/lib/${PKG}/include/common" - # Ensure that autolaunch is not explicitly disabled - if [ ! -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then - case "$-" in - *i*) - # Attempt to merge shell history across sessions/windows (works with some exceptions) - for i in shopt setopt; do - if $BYOBU_TEST $i >/dev/null; then - case $i in - shopt) $i -s histappend || true ;; - setopt) $i appendhistory || true ;; - esac - fi - done - [ -n "$PROMPT_COMMAND" ] && PROMPT_COMMAND="history -a;history -r;$PROMPT_COMMAND" || PROMPT_COMMAND="history -a;history -r" - # Source profile, if necessary - [ -z "$_byobu_sourced" ] && [ -r "$HOME/.profile" ] && . "$HOME/.profile" - if byobu-launcher; then - # Wait very briefly for the no-logout flag to get written? - sleep 0.1 - if [ -e "$BYOBU_CONFIG_DIR/no-logout-on-detach" ] || [ -e "$BYOBU_RUN_DIR/no-logout" ]; then - # The user does not want to logout on byobu detach - rm -f "$BYOBU_RUN_DIR/no-logout" # Remove one-time no-logout flag, if it exists - true - else - exit 0 - fi - fi - ;; - esac - fi -fi -unset _tty -true -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-launcher byobu-5.74/usr/bin/byobu-launcher --- byobu-5.73/usr/bin/byobu-launcher 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-launcher 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -#!/bin/sh -e -# -# byobu-launcher - conditionally launch byobu -# Copyright (C) 2010 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -# Bad things happen if you run byobu, but you don't own your $HOME -# ie, rather than "sudo byobu", you must run "sudo -H byobu" -if [ -O "$HOME" ]; then - [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" - [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX - . "${BYOBU_PREFIX}/lib/${PKG}/include/common" - if [ -e "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then - false - else - case "$TERM" in - *screen*) - # Handle nesting - if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 1 ]; then - # LC_BYOBU > 1, so user explicitly wants nested sessions - exec $BYOBU_PREFIX/bin/byobu "$@" - else - true - fi - ;; - dumb) - # Dumb terminal, don't launch - false - ;; - *) - exec $BYOBU_PREFIX/bin/byobu "$@" - ;; - esac - fi -fi -false - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-launcher.in byobu-5.74/usr/bin/byobu-launcher.in --- byobu-5.73/usr/bin/byobu-launcher.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-launcher.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,52 @@ +#!/bin/sh -e +# +# byobu-launcher - conditionally launch byobu +# Copyright (C) 2010 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +# Bad things happen if you run byobu, but you don't own your $HOME +# ie, rather than "sudo byobu", you must run "sudo -H byobu" +if [ -O "$HOME" ]; then + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" + [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + if [ -e "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then + false + else + case "$TERM" in + *screen*) + # Handle nesting + if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 1 ]; then + # LC_BYOBU > 1, so user explicitly wants nested sessions + exec $BYOBU_PREFIX/bin/byobu "$@" + else + true + fi + ;; + dumb) + # Dumb terminal, don't launch + false + ;; + *) + exec $BYOBU_PREFIX/bin/byobu "$@" + ;; + esac + fi +fi +false + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-launcher-install byobu-5.74/usr/bin/byobu-launcher-install --- byobu-5.73/usr/bin/byobu-launcher-install 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-launcher-install 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -#!/bin/sh -e -# -# byobu-launcher-install -# Copyright (C) 2008 Canonical Ltd. -# -# Authors: Nick Barcet -# Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -FLAG="$BYOBU_CONFIG_DIR/no-logout-on-detach" - -LOGOUT_ON_DETACH=1 -for i in $@; do - case "$i" in - -n|--no-logout) - LOGOUT_ON_DETACH=0 - ;; - esac -done - -update_flag() { - if [ "$LOGOUT_ON_DETACH" = "1" ]; then - rm -f "$FLAG" - else - touch "$FLAG" - fi -} - -install_launcher() { - $PKG-launcher-uninstall "$1" || true - printf "_byobu_sourced=1 . ${BYOBU_PREFIX}/bin/byobu-launch\n" >> "$1" -} - -install_launcher_fish() { - $PKG-launcher-uninstall "$1" || true - printf "status --is-login; and status --is-interactive; and exec byobu-launcher" >> "$1" -} - -# Sanitize the environment -$PKG-launcher-uninstall || true - -# Handle bourne shells, if not set globally in /etc/profile.d -if [ ! -h "/etc/profile.d/Z98-$PKG.sh" ]; then - # Install in $HOME/.profile unconditionally - install_launcher "$HOME/.profile" - # Now, install in any shell-specific profiles, if they exist - # This list may grow to support other shells - for i in ".bash_profile" ".bash_login"; do - if [ -w "$HOME/$i" ]; then - install_launcher "$HOME/$i" - fi - done -fi - -# Install in zprofile if default shell is zsh -case "$SHELL" in - *zsh) - install_launcher "$HOME/.zprofile" - ;; -esac - -# Handle fish shell -if [ -d "$HOME/.config/fish" ]; then - install_launcher_fish "$HOME/.config/fish/config.fish" -fi - -# Hush login, since we will handle motd printing -touch "$HOME"/.hushlogin -rm -f "$BYOBU_CONFIG_DIR/disable-autolaunch" - -# Update the logout/nologout flag -update_flag - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-launcher-install.in byobu-5.74/usr/bin/byobu-launcher-install.in --- byobu-5.73/usr/bin/byobu-launcher-install.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-launcher-install.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,90 @@ +#!/bin/sh -e +# +# byobu-launcher-install +# Copyright (C) 2008 Canonical Ltd. +# +# Authors: Nick Barcet +# Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +FLAG="$BYOBU_CONFIG_DIR/no-logout-on-detach" + +LOGOUT_ON_DETACH=1 +for i in $@; do + case "$i" in + -n|--no-logout) + LOGOUT_ON_DETACH=0 + ;; + esac +done + +update_flag() { + if [ "$LOGOUT_ON_DETACH" = "1" ]; then + rm -f "$FLAG" + else + touch "$FLAG" + fi +} + +install_launcher() { + $PKG-launcher-uninstall "$1" || true + printf "_byobu_sourced=1 . ${BYOBU_PREFIX}/bin/byobu-launch\n" >> "$1" +} + +install_launcher_fish() { + $PKG-launcher-uninstall "$1" || true + printf "status --is-login; and status --is-interactive; and exec byobu-launcher" >> "$1" +} + +# Sanitize the environment +$PKG-launcher-uninstall || true + +# Handle bourne shells, if not set globally in /etc/profile.d +if [ ! -h "/etc/profile.d/Z98-$PKG.sh" ]; then + # Install in $HOME/.profile unconditionally + install_launcher "$HOME/.profile" + # Now, install in any shell-specific profiles, if they exist + # This list may grow to support other shells + for i in ".bash_profile" ".bash_login"; do + if [ -w "$HOME/$i" ]; then + install_launcher "$HOME/$i" + fi + done +fi + +# Install in zprofile if default shell is zsh +case "$SHELL" in + *zsh) + install_launcher "$HOME/.zprofile" + ;; +esac + +# Handle fish shell +if [ -d "$HOME/.config/fish" ]; then + install_launcher_fish "$HOME/.config/fish/config.fish" +fi + +# Hush login, since we will handle motd printing +touch "$HOME"/.hushlogin +rm -f "$BYOBU_CONFIG_DIR/disable-autolaunch" + +# Update the logout/nologout flag +update_flag + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-launcher-uninstall byobu-5.74/usr/bin/byobu-launcher-uninstall --- byobu-5.73/usr/bin/byobu-launcher-uninstall 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-launcher-uninstall 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -#!/bin/sh -e -# -# byobu-launcher-uninstall -# Copyright (C) 2008 Canonical Ltd. -# -# Authors: Nick Barcet -# Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -remove_launcher() { - dest=$1 - if [ -w "$dest" ]; then - # keep any comments, and remove lines invoking byobu: - $BYOBU_SED -i -e '/^\s*#/n' -e "/\b$PKG-launch\$/d" -e "/ screen-launch/d" "$dest" -e "/byobu-launcher$/d" - fi -} - -if [ -f "$1" ]; then - remove_launcher "$1" -else - for i in ".profile" ".bashrc" ".bash_profile" ".bash_login" ".zprofile" ".config/fish/config.fish"; do - remove_launcher "$HOME/$i" - done -fi - -mkdir -p "$BYOBU_CONFIG_DIR" -touch "$BYOBU_CONFIG_DIR/disable-autolaunch" -# install disabled motd printing; re-enable -rm -f "$HOME"/.hushlogin - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-launcher-uninstall.in byobu-5.74/usr/bin/byobu-launcher-uninstall.in --- byobu-5.73/usr/bin/byobu-launcher-uninstall.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-launcher-uninstall.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,47 @@ +#!/bin/sh -e +# +# byobu-launcher-uninstall +# Copyright (C) 2008 Canonical Ltd. +# +# Authors: Nick Barcet +# Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +remove_launcher() { + dest=$1 + if [ -w "$dest" ]; then + # keep any comments, and remove lines invoking byobu: + $BYOBU_SED -i -e '/^\s*#/n' -e "/\b$PKG-launch\$/d" -e "/ screen-launch/d" "$dest" -e "/byobu-launcher$/d" + fi +} + +if [ -f "$1" ]; then + remove_launcher "$1" +else + for i in ".profile" ".bashrc" ".bash_profile" ".bash_login" ".zprofile" ".config/fish/config.fish"; do + remove_launcher "$HOME/$i" + done +fi + +mkdir -p "$BYOBU_CONFIG_DIR" +touch "$BYOBU_CONFIG_DIR/disable-autolaunch" +# install disabled motd printing; re-enable +rm -f "$HOME"/.hushlogin + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-launch.in byobu-5.74/usr/bin/byobu-launch.in --- byobu-5.73/usr/bin/byobu-launch.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-launch.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,81 @@ +#!/bin/sh -e +# +# byobu-launch - call the launcher if we're in an interactive shell +# Copyright (C) 2010 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +# 1) Prevent recursion, and multiple sourcing of profiles with the BYOBU_SOURCED_PROFILE environment variable. +# 2) Respect environment variables (LC_BYOBU and BYOBU_DISABLE) passable over SSH to disable +# Byobu launch. This puts that configurability on the SSH client, +# in addition to the server. +# To use over SSH, your /etc/ssh/sshd_config and /etc/ssh/ssh_config +# must pass this variable with AcceptEnv and SendEnv. +# Note that LC_* are passed by default on Debian/Ubuntu, we'll optionally +# support LC_BYOBU=0 +# And in your local bashrc: +# $HOME/.bashrc: export LC_BYOBU=0 +# or edit your sshd_config, ssh_config, and set: +# $HOME/.bashrc: export BYOBU_DISABLE=1 + +_tty=$(tty) +if [ "${_tty#/dev/ttyS}" != "$_tty" ]; then + # Don't autolaunch byobu on serial consoles + # You can certainly run 'byobu' manually, though + echo + echo "INFO: Disabling auto-launch of Byobu on this serial console" + echo "INFO: You can still run 'byobu' manually at the command line" + echo +elif [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_DISABLE" != "1" ] && [ -O "$HOME" ]; then + unset _tty + BYOBU_SOURCED_PROFILE=1 + PKG="byobu" + [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" + [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX + . "${BYOBU_PREFIX}/lib/${PKG}/include/common" + # Ensure that autolaunch is not explicitly disabled + if [ ! -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then + case "$-" in + *i*) + # Attempt to merge shell history across sessions/windows (works with some exceptions) + for i in shopt setopt; do + if $BYOBU_TEST $i >/dev/null; then + case $i in + shopt) $i -s histappend || true ;; + setopt) $i appendhistory || true ;; + esac + fi + done + [ -n "$PROMPT_COMMAND" ] && PROMPT_COMMAND="history -a;history -r;$PROMPT_COMMAND" || PROMPT_COMMAND="history -a;history -r" + # Source profile, if necessary + [ -z "$_byobu_sourced" ] && [ -r "$HOME/.profile" ] && . "$HOME/.profile" + if byobu-launcher; then + # Wait very briefly for the no-logout flag to get written? + sleep 0.1 + if [ -e "$BYOBU_CONFIG_DIR/no-logout-on-detach" ] || [ -e "$BYOBU_RUN_DIR/no-logout" ]; then + # The user does not want to logout on byobu detach + rm -f "$BYOBU_RUN_DIR/no-logout" # Remove one-time no-logout flag, if it exists + true + else + exit 0 + fi + fi + ;; + esac + fi +fi +unset _tty +true +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-layout byobu-5.74/usr/bin/byobu-layout --- byobu-5.73/usr/bin/byobu-layout 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-layout 1970-01-01 00:00:00.000000000 +0000 @@ -1,121 +0,0 @@ -#!/bin/sh -e -# -# layout: save and restore byobu layouts -# Copyright (C) 2011 Dustin Kirkland -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -# Get the layouts directory -DIR="$BYOBU_CONFIG_DIR/layouts" -mkdir -p "$DIR" -PRESETS="even-horizontal even-vertical main-horizontal main-vertical tiled" -current_panes=$(tmux list-panes | wc -l) - -list_layouts() { - echo - echo "Restore layout with , save a layout with " - echo - echo "Byobu Saved Layouts" - local count=0 i= desc= count= p= - for i in $PRESETS "$DIR"/*; do - desc=${i##*/} - count=$(expr $count + 1) - [ -f "$i" ] && p=$(head -n1 "$i") - [ -n "$p" ] && p=" ($p splits)" - echo " $count. $desc$p" - done - echo - _RET="$count" -} - -case "$1" in - "save") - layout=$(tmux list-windows | grep "(active)$" | sed -e "s/.*\[layout //" -e "s/\] (active)$//") - panes=$(tmux list-panes | wc -l) - if [ -n "$2" ]; then - name="$2" - else - while true; do - list_layouts - echo -n "Enter a unique name to save this layout: " - name=$(head -n1) - valid=1 - for i in $PRESETS "$DIR"/*; do - i=${i##*/} - if [ "$i" = "$name" ]; then - valid=0 - fi - done - [ "$valid" = "1" ] && break - done - fi - printf "$panes\n$layout\n" > "$BYOBU_CONFIG_DIR/layouts/$name" - ;; - "restore") - if [ -n "$2" ]; then - # Layout selected on the command line - name="$2" - else - # List the saved layouts, prompt the user to select one - list_layouts - count="$_RET" - while true; do - echo -n "Select a layout to restore [1-$count]: " - selected=$(head -n1) - if [ -n "$selected" ] && [ $selected -le $count ] && [ $selected -ge 1 ]; then - break - fi - done - count=0 - for i in $PRESETS "$DIR"/*; do - count=$(expr $count + 1) - if [ $count -eq $selected ]; then - name=$(basename "$i") - break - fi - done - fi - # Get the details of the selected layout - panes= - layout= - if [ -f "$DIR/$name" ]; then - panes=$(head -n1 "$DIR/$name") - layout=$(tail -n1 "$DIR/$name") - else - if [ $current_panes -eq 1 ]; then - panes=4 - else - panes=0 - fi - layout="$name" - fi - # Create panes if nececessary to restore the layout - while [ $(tmux list-panes | wc -l) -lt $panes ]; do - tmux split-window - done - # Finally, restore the layout and refresh - tmux select-layout "$layout" - tmux source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc" - ;; - *) - echo "ERROR: Invalid argument, try [save|restore]" 2>&1 - exit 1 - ;; -esac diff -Nru byobu-5.73/usr/bin/byobu-layout.in byobu-5.74/usr/bin/byobu-layout.in --- byobu-5.73/usr/bin/byobu-layout.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-layout.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,121 @@ +#!/bin/sh -e +# +# layout: save and restore byobu layouts +# Copyright (C) 2011 Dustin Kirkland +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +# Get the layouts directory +DIR="$BYOBU_CONFIG_DIR/layouts" +mkdir -p "$DIR" +PRESETS="even-horizontal even-vertical main-horizontal main-vertical tiled" +current_panes=$(tmux list-panes | wc -l) + +list_layouts() { + echo + echo "Restore layout with , save a layout with " + echo + echo "Byobu Saved Layouts" + local count=0 i= desc= count= p= + for i in $PRESETS "$DIR"/*; do + desc=${i##*/} + count=$(expr $count + 1) + [ -f "$i" ] && p=$(head -n1 "$i") + [ -n "$p" ] && p=" ($p splits)" + echo " $count. $desc$p" + done + echo + _RET="$count" +} + +case "$1" in + "save") + layout=$(tmux list-windows | grep "(active)$" | sed -e "s/.*\[layout //" -e "s/\] (active)$//") + panes=$(tmux list-panes | wc -l) + if [ -n "$2" ]; then + name="$2" + else + while true; do + list_layouts + echo -n "Enter a unique name to save this layout: " + name=$(head -n1) + valid=1 + for i in $PRESETS "$DIR"/*; do + i=${i##*/} + if [ "$i" = "$name" ]; then + valid=0 + fi + done + [ "$valid" = "1" ] && break + done + fi + printf "$panes\n$layout\n" > "$BYOBU_CONFIG_DIR/layouts/$name" + ;; + "restore") + if [ -n "$2" ]; then + # Layout selected on the command line + name="$2" + else + # List the saved layouts, prompt the user to select one + list_layouts + count="$_RET" + while true; do + echo -n "Select a layout to restore [1-$count]: " + selected=$(head -n1) + if [ -n "$selected" ] && [ $selected -le $count ] && [ $selected -ge 1 ]; then + break + fi + done + count=0 + for i in $PRESETS "$DIR"/*; do + count=$(expr $count + 1) + if [ $count -eq $selected ]; then + name=$(basename "$i") + break + fi + done + fi + # Get the details of the selected layout + panes= + layout= + if [ -f "$DIR/$name" ]; then + panes=$(head -n1 "$DIR/$name") + layout=$(tail -n1 "$DIR/$name") + else + if [ $current_panes -eq 1 ]; then + panes=4 + else + panes=0 + fi + layout="$name" + fi + # Create panes if nececessary to restore the layout + while [ $(tmux list-panes | wc -l) -lt $panes ]; do + tmux split-window + done + # Finally, restore the layout and refresh + tmux select-layout "$layout" + tmux source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc" + ;; + *) + echo "ERROR: Invalid argument, try [save|restore]" 2>&1 + exit 1 + ;; +esac diff -Nru byobu-5.73/usr/bin/byobu-prompt byobu-5.74/usr/bin/byobu-prompt --- byobu-5.73/usr/bin/byobu-prompt 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-prompt 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#!/bin/sh -e -# -# byobu-prompt -# Copyright (C) 2013 Dustin Kirkland -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -echo -echo -n "Do you want to enable Byobu's bash color prompt? [Y/n]: " -answer=$(head -n1) -echo -case "$answer" in - "n"|"N") - exec byobu-disable-prompt - ;; - *) - exec byobu-enable-prompt -esac - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-prompt.in byobu-5.74/usr/bin/byobu-prompt.in --- byobu-5.73/usr/bin/byobu-prompt.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-prompt.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,37 @@ +#!/bin/sh -e +# +# byobu-prompt +# Copyright (C) 2013 Dustin Kirkland +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +echo +echo -n "Do you want to enable Byobu's bash color prompt? [Y/n]: " +answer=$(head -n1) +echo +case "$answer" in + "n"|"N") + exec byobu-disable-prompt + ;; + *) + exec byobu-enable-prompt +esac + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-quiet byobu-5.74/usr/bin/byobu-quiet --- byobu-5.73/usr/bin/byobu-quiet 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-quiet 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/bin/sh -# -# byobu-quiet - disable the hardstatus and all indicators -# Copyright (C) 2011 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -FLAG="$BYOBU_CONFIG_DIR/status.disable" - -# Clean up environment -$BYOBU_SED -i "/hardstatus/d" "$BYOBU_CONFIG_DIR/keybindings" || true -if [ "$1" = "--undo" ]; then - rm -f "$FLAG" -else - touch "$FLAG" - # BUG: Need to make this dynamic and following - status="$USER@$(hostname)" - echo "hardstatus lastline '$status'" >> "$BYOBU_CONFIG_DIR/keybindings" -fi -$BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile" - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-quiet.in byobu-5.74/usr/bin/byobu-quiet.in --- byobu-5.73/usr/bin/byobu-quiet.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-quiet.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,39 @@ +#!/bin/sh +# +# byobu-quiet - disable the hardstatus and all indicators +# Copyright (C) 2011 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +FLAG="$BYOBU_CONFIG_DIR/status.disable" + +# Clean up environment +$BYOBU_SED -i "/hardstatus/d" "$BYOBU_CONFIG_DIR/keybindings" || true +if [ "$1" = "--undo" ]; then + rm -f "$FLAG" +else + touch "$FLAG" + # BUG: Need to make this dynamic and following + status="$USER@$(hostname)" + echo "hardstatus lastline '$status'" >> "$BYOBU_CONFIG_DIR/keybindings" +fi +$BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile" + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-reconnect-sockets byobu-5.74/usr/bin/byobu-reconnect-sockets --- byobu-5.73/usr/bin/byobu-reconnect-sockets 2013-11-01 19:49:07.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-reconnect-sockets 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -#!/bin/sh -# -# byobu-reconnect-sockets - source this file to re-establish -# GPG_AGENT_INFO and DBUS_SESSION_BUS_ADDRESS, -# useful when reconnecting to an existing -# byobu session. -# -# Copyright (C) 2009 Canonical Ltd. -# Copyright (C) 2012 Dustin Kirkland -# -# Authors: Dustin Kirkland -# Ryan C. Thompson -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -case "$-" in - *i*) - # no-op - ;; - *) - echo 2>&1 - echo "ERROR: You must source this file, rather than execute it." 2>&1 - echo " . $0" 2>&1 - echo 2>&1 - exit 1 - ;; -esac - -export_and_send () { - var="$1" - value="$(eval "echo \$$var")" - export "$var" - case $BYOBU_BACKEND in - tmux) - tmux setenv "$var" "$value" - ;; - screen) - screen -X setenv "$var" "$value" - ;; - esac -} - -screen_update () { - # Ensure that screen's environment variables/values get propagated here - # Enable word splitting for zsh: - [ "x$ZSH_VERSION" != x ] && setopt local_options sh_word_split - tempfile=$(mktemp -q) && { - for var in $VARS_TO_UPDATE; do - screen sh -c "echo export $var=\$$var >> \"$tempfile\"" - done - . "$tempfile" - rm -f "$tempfile" - } -} - -tmux_update () { - # Ensure that tmux's environment variables/values get propagated here - # Enable word splitting for zsh: - [ "x$ZSH_VERSION" != x ] && setopt local_options sh_word_split - for var in $VARS_TO_UPDATE; do - expr="$(tmux showenv | grep "^$var=")" - if [ -n "$expr" ]; then - export "$expr" - fi - done -} - -# Pull environment variables/values from backend and update/export here -VARS_TO_UPDATE="DISPLAY DBUS_SESSION_BUS_ADDRESS SESSION_MANAGER GPG_AGENT_INFO XDG_SESSION_COOKIE XDG_SESSION_PATH GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID WINDOWID UPSTART_JOB UPSTART_EVENTS UPSTART_SESSION UPSTART_INSTANCE" - -case $BYOBU_BACKEND in - tmux) - tmux_update - ;; - screen) - screen_update - ;; -esac - -# Establish gpg-agent socket, helps when reconnecting to a detached session -newest "$HOME/.gnupg/gpg-agent-info-*" && . "$_RET" && export_and_send GPG_AGENT_INFO - -# Reconnect dbus, source the most recently touched session-bus -# Sorry, ls -t is needed here, to sort by time -newest "$HOME/.dbus/session-bus/*" && . "$_RET" - -[ -r "$BYOBU_RUN_DIR/sockets" ] && . "$BYOBU_RUN_DIR/sockets" -export_and_send DBUS_SESSION_BUS_ADDRESS -export_and_send SESSION_MANAGER - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-reconnect-sockets.in byobu-5.74/usr/bin/byobu-reconnect-sockets.in --- byobu-5.73/usr/bin/byobu-reconnect-sockets.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-reconnect-sockets.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,106 @@ +#!/bin/sh +# +# byobu-reconnect-sockets - source this file to re-establish +# GPG_AGENT_INFO and DBUS_SESSION_BUS_ADDRESS, +# useful when reconnecting to an existing +# byobu session. +# +# Copyright (C) 2009 Canonical Ltd. +# Copyright (C) 2012 Dustin Kirkland +# +# Authors: Dustin Kirkland +# Ryan C. Thompson +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +case "$-" in + *i*) + # no-op + ;; + *) + echo 2>&1 + echo "ERROR: You must source this file, rather than execute it." 2>&1 + echo " . $0" 2>&1 + echo 2>&1 + exit 1 + ;; +esac + +export_and_send () { + var="$1" + value="$(eval "echo \$$var")" + export "$var" + case $BYOBU_BACKEND in + tmux) + tmux setenv "$var" "$value" + ;; + screen) + screen -X setenv "$var" "$value" + ;; + esac +} + +screen_update () { + # Ensure that screen's environment variables/values get propagated here + # Enable word splitting for zsh: + [ "x$ZSH_VERSION" != x ] && setopt local_options sh_word_split + tempfile=$(mktemp -q) && { + for var in $VARS_TO_UPDATE; do + screen sh -c "echo export $var=\$$var >> \"$tempfile\"" + done + . "$tempfile" + rm -f "$tempfile" + } +} + +tmux_update () { + # Ensure that tmux's environment variables/values get propagated here + # Enable word splitting for zsh: + [ "x$ZSH_VERSION" != x ] && setopt local_options sh_word_split + for var in $VARS_TO_UPDATE; do + expr="$(tmux showenv | grep "^$var=")" + if [ -n "$expr" ]; then + export "$expr" + fi + done +} + +# Pull environment variables/values from backend and update/export here +VARS_TO_UPDATE="DISPLAY DBUS_SESSION_BUS_ADDRESS SESSION_MANAGER GPG_AGENT_INFO XDG_SESSION_COOKIE XDG_SESSION_PATH GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID WINDOWID UPSTART_JOB UPSTART_EVENTS UPSTART_SESSION UPSTART_INSTANCE" + +case $BYOBU_BACKEND in + tmux) + tmux_update + ;; + screen) + screen_update + ;; +esac + +# Establish gpg-agent socket, helps when reconnecting to a detached session +newest "$HOME/.gnupg/gpg-agent-info-*" && . "$_RET" && export_and_send GPG_AGENT_INFO + +# Reconnect dbus, source the most recently touched session-bus +# Sorry, ls -t is needed here, to sort by time +newest "$HOME/.dbus/session-bus/*" && . "$_RET" + +[ -r "$BYOBU_RUN_DIR/sockets" ] && . "$BYOBU_RUN_DIR/sockets" +export_and_send DBUS_SESSION_BUS_ADDRESS +export_and_send SESSION_MANAGER + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-select-backend byobu-5.74/usr/bin/byobu-select-backend --- byobu-5.73/usr/bin/byobu-select-backend 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-select-backend 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -#!/bin/sh -e -# -# byobu-select-backend -# Copyright (C) 2011 Dustin Kirkland -# -# Authors: Dustin Kirkland -# -# 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 . - - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -usage () { - cat < "$BYOBU_CONFIG_DIR/backend" diff -Nru byobu-5.73/usr/bin/byobu-select-backend.in byobu-5.74/usr/bin/byobu-select-backend.in --- byobu-5.73/usr/bin/byobu-select-backend.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-select-backend.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,63 @@ +#!/bin/sh -e +# +# byobu-select-backend +# Copyright (C) 2011 Dustin Kirkland +# +# Authors: Dustin Kirkland +# +# 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 . + + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +usage () { + cat < "$BYOBU_CONFIG_DIR/backend" diff -Nru byobu-5.73/usr/bin/byobu-select-profile byobu-5.74/usr/bin/byobu-select-profile --- byobu-5.73/usr/bin/byobu-select-profile 2013-11-06 15:18:05.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-select-profile 1970-01-01 00:00:00.000000000 +0000 @@ -1,274 +0,0 @@ -#!/bin/sh -e -# -# byobu-select-profile -# Copyright (C) 2008 Canonical Ltd. -# -# Authors: Dustin Kirkland -# Nick Barcet -# -# 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 . - - -# If you change any strings, please generate localization information with: -# ./debian/rules get-po - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -TEXTDOMAIN="$PKG" - -COLORS="default_light \ - default_dark \ - white \ - black \ - grey \ - dark_grey \ - light_grey \ - blue \ - light_blue \ - cyan \ - light_cyan \ - green \ - light_green \ - purple \ - light_purple \ - red \ - light_red \ - yellow \ - brown" - -# Find a hash utility -for i in md5sum md5 sha512sum sha256sum sha1sum shasum shasum5.12 shasum5.10; do - if $BYOBU_TEST $i >/dev/null 2>&1; then - HASH="$i" - break - fi -done - -usage () { - cat </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 - echo "$1" - return - fi - color="$1" - case $color in - default_light) letter="d";; - default_dark) letter="D";; - black) letter="k";; - dark_grey) letter="K";; - blue) letter="b";; - light_blue) letter="B";; - cyan) letter="c";; - light_cyan) letter="C";; - green) letter="g";; - light_green) letter="G";; - purple) letter="m";; - light_purple) letter="M";; - red) letter="r";; - light_red) letter="R";; - grey) letter="w";; - light_grey) letter="W";; - white) letter="w";; - yellow) letter="Y";; - brown) letter="y";; - *) letter="d";; - esac - echo "$letter" -} - -setcolor_screen() { - which="$1" - color="$2" - [ -r $FILE ] && . $FILE - if [ "$which" = "foreground" ]; then - FOREGROUND=$(getletter "$color") - else - BACKGROUND=$(getletter "$color") - fi - [ "$MONOCHROME" = "1" ] || MONOCHROME=0 - printf "FOREGROUND=$FOREGROUND\nBACKGROUND=$BACKGROUND\nMONOCHROME=$MONOCHROME" > $FILE - touch "$BYOBU_RUN_DIR/reload-required" - $BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile" -} - -get_contrast() { - # See section 2.2: http://www.w3.org/TR/AERT#color-contrast - local awk="awk" - if $BYOBU_TEST gawk >/dev/null 2>&1; then - awk="gawk" - fi - local hex="$(echo "$1" | sed -e "s/\(..\)\(..\)\(..\)/\1 \2 \3/")" - local bright=$(echo $hex | $awk --non-decimal-data '{printf "%0.0f",(("0x"$1)*299+("0x"$2)*587+("0x"$3)*114)/1000}') - if [ $bright -ge 130 ]; then - _RET="black" - else - _RET="white" - fi -} - -setcolor_tmux() { - if [ "$BYOBU_BACKEND" != "tmux" ]; then - echo "WARNING: This functionality is only supported in Byobu with the tmux backend" 1>&2 - fi - dark="$1" - get_contrast "$dark" - light="$_RET" - accent="magenta" - highlight="red" - monochrome="0" - printf "BYOBU_DARK=\"$dark\"\nBYOBU_LIGHT=$light\nBYOBU_ACCENT=$accent\nBYOBU_HIGHLIGHT=$highlight\nMONOCHROME=$MONOCHROME" > "$FILE".tmux - tmux source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc" -} - -if [ $# -eq 0 ]; then - prompt "background" - case "$BYOBU_BACKEND" in - screen) - prompt "foreground" - ;; - esac -else - while true; do - case "$1" in - -b|--background) - setcolor_screen "background" "$2" - shift 2 - ;; - -f|--foreground) - setcolor_screen "foreground" "$2" - shift 2 - ;; - -l|--list) - listprofiles - shift - break - ;; - -h|--hostname) - color=$(hostname | $HASH | head -c 6) - setcolor_tmux "$color" - shift - break - ;; - -i|--ip) - [ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc" - . $BYOBU_PREFIX/lib/$PKG/ip_address - color=$(__ip_address t| $HASH | head -c 6) - setcolor_tmux "$color" - shift - break - ;; - -r|--random) - color=$(head -c 10 /dev/urandom | $HASH | head -c 6) - setcolor_tmux "\#$color" - shift - break - ;; - *) - usage - exit 1 - ;; - --) - shift - break - ;; - esac - [ $# -eq 0 ] && break - done -fi - -exit 0 - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-select-profile.in byobu-5.74/usr/bin/byobu-select-profile.in --- byobu-5.73/usr/bin/byobu-select-profile.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-select-profile.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,274 @@ +#!/bin/sh -e +# +# byobu-select-profile +# Copyright (C) 2008 Canonical Ltd. +# +# Authors: Dustin Kirkland +# Nick Barcet +# +# 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 . + + +# If you change any strings, please generate localization information with: +# ./debian/rules get-po + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +TEXTDOMAIN="$PKG" + +COLORS="default_light \ + default_dark \ + white \ + black \ + grey \ + dark_grey \ + light_grey \ + blue \ + light_blue \ + cyan \ + light_cyan \ + green \ + light_green \ + purple \ + light_purple \ + red \ + light_red \ + yellow \ + brown" + +# Find a hash utility +for i in md5sum md5 sha512sum sha256sum sha1sum shasum shasum5.12 shasum5.10; do + if $BYOBU_TEST $i >/dev/null 2>&1; then + HASH="$i" + break + fi +done + +usage () { + cat </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 + echo "$1" + return + fi + color="$1" + case $color in + default_light) letter="d";; + default_dark) letter="D";; + black) letter="k";; + dark_grey) letter="K";; + blue) letter="b";; + light_blue) letter="B";; + cyan) letter="c";; + light_cyan) letter="C";; + green) letter="g";; + light_green) letter="G";; + purple) letter="m";; + light_purple) letter="M";; + red) letter="r";; + light_red) letter="R";; + grey) letter="w";; + light_grey) letter="W";; + white) letter="w";; + yellow) letter="Y";; + brown) letter="y";; + *) letter="d";; + esac + echo "$letter" +} + +setcolor_screen() { + which="$1" + color="$2" + [ -r $FILE ] && . $FILE + if [ "$which" = "foreground" ]; then + FOREGROUND=$(getletter "$color") + else + BACKGROUND=$(getletter "$color") + fi + [ "$MONOCHROME" = "1" ] || MONOCHROME=0 + printf "FOREGROUND=$FOREGROUND\nBACKGROUND=$BACKGROUND\nMONOCHROME=$MONOCHROME" > $FILE + touch "$BYOBU_RUN_DIR/reload-required" + $BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile" +} + +get_contrast() { + # See section 2.2: http://www.w3.org/TR/AERT#color-contrast + local awk="awk" + if $BYOBU_TEST gawk >/dev/null 2>&1; then + awk="gawk" + fi + local hex="$(echo "$1" | sed -e "s/\(..\)\(..\)\(..\)/\1 \2 \3/")" + local bright=$(echo $hex | $awk --non-decimal-data '{printf "%0.0f",(("0x"$1)*299+("0x"$2)*587+("0x"$3)*114)/1000}') + if [ $bright -ge 130 ]; then + _RET="black" + else + _RET="white" + fi +} + +setcolor_tmux() { + if [ "$BYOBU_BACKEND" != "tmux" ]; then + echo "WARNING: This functionality is only supported in Byobu with the tmux backend" 1>&2 + fi + dark="$1" + get_contrast "$dark" + light="$_RET" + accent="magenta" + highlight="red" + monochrome="0" + printf "BYOBU_DARK=\"$dark\"\nBYOBU_LIGHT=$light\nBYOBU_ACCENT=$accent\nBYOBU_HIGHLIGHT=$highlight\nMONOCHROME=$MONOCHROME" > "$FILE".tmux + tmux source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc" +} + +if [ $# -eq 0 ]; then + prompt "background" + case "$BYOBU_BACKEND" in + screen) + prompt "foreground" + ;; + esac +else + while true; do + case "$1" in + -b|--background) + setcolor_screen "background" "$2" + shift 2 + ;; + -f|--foreground) + setcolor_screen "foreground" "$2" + shift 2 + ;; + -l|--list) + listprofiles + shift + break + ;; + -h|--hostname) + color=$(hostname | $HASH | head -c 6) + setcolor_tmux "$color" + shift + break + ;; + -i|--ip) + [ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc" + . $BYOBU_PREFIX/lib/$PKG/ip_address + color=$(__ip_address t| $HASH | head -c 6) + setcolor_tmux "$color" + shift + break + ;; + -r|--random) + color=$(head -c 10 /dev/urandom | $HASH | head -c 6) + setcolor_tmux "\#$color" + shift + break + ;; + *) + usage + exit 1 + ;; + --) + shift + break + ;; + esac + [ $# -eq 0 ] && break + done +fi + +exit 0 + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-select-session byobu-5.74/usr/bin/byobu-select-session --- byobu-5.73/usr/bin/byobu-select-session 2013-12-17 01:48:43.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-select-session 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#!/bin/sh -e -# -# byobu-select-session - interactive session select wrapper script -# Copyright (C) 2013 Dustin Kirkland -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/select-session.py" diff -Nru byobu-5.73/usr/bin/byobu-select-session.in byobu-5.74/usr/bin/byobu-select-session.in --- byobu-5.73/usr/bin/byobu-select-session.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-select-session.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,24 @@ +#!/bin/sh -e +# +# byobu-select-session - interactive session select wrapper script +# Copyright (C) 2013 Dustin Kirkland +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/select-session.py" diff -Nru byobu-5.73/usr/bin/byobu-shell byobu-5.74/usr/bin/byobu-shell --- byobu-5.73/usr/bin/byobu-shell 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-shell 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -#!/bin/sh -# -# byobu-shell: display the MOTD and launch the default shell -# Copyright (C) 2008 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -FLAG="$BYOBU_CONFIG_DIR/.welcome-displayed" - -[ -r /etc/motd ] && cat /etc/motd - -if [ ! -e "$FLAG" ]; then - echo - echo "Welcome to the light, powerful, text window manager, Byobu." - echo "You can toggle the launch of Byobu at login with:" - echo " 'byobu-disable' and 'byobu-enable'" - echo - echo "For tips, tricks, and more information, see:" - echo " * http://bit.ly/byobu-help" - echo - touch "$FLAG" -fi - -[ -n "$SHELL" -a -x "$SHELL" ] && exec "$SHELL" || exec /bin/sh - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-shell.in byobu-5.74/usr/bin/byobu-shell.in --- byobu-5.73/usr/bin/byobu-shell.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-shell.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,43 @@ +#!/bin/sh +# +# byobu-shell: display the MOTD and launch the default shell +# Copyright (C) 2008 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +FLAG="$BYOBU_CONFIG_DIR/.welcome-displayed" + +[ -r /etc/motd ] && cat /etc/motd + +if [ ! -e "$FLAG" ]; then + echo + echo "Welcome to the light, powerful, text window manager, Byobu." + echo "You can toggle the launch of Byobu at login with:" + echo " 'byobu-disable' and 'byobu-enable'" + echo + echo "For tips, tricks, and more information, see:" + echo " * http://bit.ly/byobu-help" + echo + touch "$FLAG" +fi + +[ -n "$SHELL" -a -x "$SHELL" ] && exec "$SHELL" || exec /bin/sh + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-silent byobu-5.74/usr/bin/byobu-silent --- byobu-5.73/usr/bin/byobu-silent 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-silent 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#!/bin/sh -# -# byobu-silence - disable the hardstatus, all indicators, and the window list -# Copyright (C) 2011 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -FLAG="$BYOBU_CONFIG_DIR/status.disable" - -# Clean up environment -$BYOBU_SED -i "/caption/d" "$BYOBU_CONFIG_DIR/keybindings" || true -if [ "$1" = "--undo" ]; then - rm -f "$FLAG" -else - touch "$FLAG" - echo "caption splitonly ''" >> "$BYOBU_CONFIG_DIR/keybindings" -fi -exec byobu-quiet "$@" - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-silent.in byobu-5.74/usr/bin/byobu-silent.in --- byobu-5.73/usr/bin/byobu-silent.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-silent.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,37 @@ +#!/bin/sh +# +# byobu-silence - disable the hardstatus, all indicators, and the window list +# Copyright (C) 2011 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +FLAG="$BYOBU_CONFIG_DIR/status.disable" + +# Clean up environment +$BYOBU_SED -i "/caption/d" "$BYOBU_CONFIG_DIR/keybindings" || true +if [ "$1" = "--undo" ]; then + rm -f "$FLAG" +else + touch "$FLAG" + echo "caption splitonly ''" >> "$BYOBU_CONFIG_DIR/keybindings" +fi +exec byobu-quiet "$@" + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-status byobu-5.74/usr/bin/byobu-status --- byobu-5.73/usr/bin/byobu-status 2014-02-09 13:13:09.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-status 1970-01-01 00:00:00.000000000 +0000 @@ -1,144 +0,0 @@ -#!/bin/sh -# -# byobu-status: byobu's cached status gathering -# -# Copyright (C) 2011 Dustin Kirkland -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -# Make sure status is not disabled -[ -f "$BYOBU_CONFIG_DIR/status.disable" ] && exit 0 - -# Clean and create cache directories -[ -d "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND" ] || mkdir -p "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND" -[ -d "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND" ] || mkdir -p "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND" - -# Source configurations -. "${BYOBU_PREFIX}/lib/${PKG}/include/icons" -for i in "${BYOBU_PREFIX}/share/$PKG/status/status" "${BYOBU_PREFIX}/share/$PKG/status/statusrc" "$BYOBU_CONFIG_DIR/status" "$BYOBU_CONFIG_DIR/statusrc" "$BYOBU_CONFIG_DIR/color" "$BYOBU_CONFIG_DIR/color.tmux"; do - [ -r "$i" ] && . "$i" -done - -case "$BYOBU_BACKEND" in - screen) - # Reload profile, if necessary - if [ -e "/var/run/screen/S-$USER/$PKG.reload-required" ] || [ -e "$BYOBU_RUN_DIR/reload-required" ]; then - if [ -r "$BYOBU_CONFIG_DIR/profile" ]; then - # If the forced janitorial steps succeed, try a profile reload - byobu-janitor --force && screen -X at 0 source "$BYOBU_CONFIG_DIR/profile" >/dev/null 2>&1 - fi - fi - ;; - tmux) - # Fix status printing for small terminal sizes in tmux - width=$(tmux list-windows -F "#{session_width}") - if [ -r "$BYOBU_RUN_DIR/width" ]; then - read w_last < $BYOBU_RUN_DIR/width 2>/dev/null 1>&2 - else - w_last=0 - fi - for w in $width; do - if [ "$w" != "$w_last" ]; then - # go through cat due to possible tmux/epoll bug - tmux set -g status-left-length $(($w*1/4)) | cat >/dev/null 2>&1 - tmux set -g status-right-length $(($w*3/4)) | cat >/dev/null 2>&1 - printf "$w" > $BYOBU_RUN_DIR/width - break - fi - done - ;; -esac - -# Get the current timestamp -get_now; NOW=${_RET} - -get_status() { - local cachepath="$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/$1" - local lastpath="$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND/$1" - local lastrun=0 - [ -r "$lastpath" ] && read lastrun < "$lastpath" - case "$1" in - ip_address4) - local IPV6=0 - local function="ip_address" - ;; - ip_address6) - local IPV6=1 - local function="ip_address" - ;; - *) - local function="$1" - ;; - esac - status_freq "$function" - local expiry=$(($lastrun+$_RET)) - find_script "$function" && . "${_RET}" - # Update cache now, if necessary - if [ $NOW -ge $expiry ] || [ "$lastrun" = "0" ]; then - "__$function" > "$cachepath".new - fi - # Check if we have data in the cache - if [ -s "$cachepath".new ]; then - # Looks like we have an updated cache, use it - mv -f "$cachepath".new "$cachepath" - printf "%s" "$NOW" > "$lastpath" - IFS= read line < "$cachepath"; printf "%s" "$line" - elif [ -s "$cachepath" ]; then - # New cache is empty, but we have data from our last run, use it - IFS= read line < "$cachepath"; printf "%s" "$line" - fi -} - -case "$1" in - *left|*right) - eval items="\$$1" - for i in $items; do - case "$i" in \#*) continue ;; esac - get_status "$i" - done - ;; - --detail) - VER= - if $BYOBU_TEST dpkg-query >/dev/null; then - VER=$(set -- $(dpkg-query --show $PKG); printf "%s\n" "$2") - fi - printf "$PKG-$VER Detailed Status Navigation\n" - if $BYOBU_TEST vim >/dev/null && `vim --version | grep -q +folding`; then - printf " Expand all - zr\t\tCollapse all - zm\n Expand one - zo\t\tCollapse one - zc\n\n" - fi - for i in "$BYOBU_PREFIX/lib/$PKG"/*; do - [ -f "$i" ] || continue - i=${i##*/} - case "$i" in - include|menu|notify_osd|time_binary) continue ;; - esac - find_script "$i" && . "${_RET}" - short=$(eval "__${i}" | $BYOBU_SED -e 's/^\s*//' -e 's/\s*$//' -e 's/.{[^}]*}//g') - detail=$(eval "__${i}_detail" 2>/dev/null | $BYOBU_SED -e '/^$/d' -e 's/^/\t/g') - printf "%s\n\t(%s)\n" "$short" "$i" - [ -n "$detail" ] && printf "%s\n" "$detail" - done - ;; - color) - [ -z "$FOREGROUND" ] && FOREGROUND="w" - [ -z "$BACKGROUND" ] && BACKGROUND="k" - printf "$ESC{= $BACKGROUND$FOREGROUND}" - ;; -esac diff -Nru byobu-5.73/usr/bin/byobu-status-detail byobu-5.74/usr/bin/byobu-status-detail --- byobu-5.73/usr/bin/byobu-status-detail 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-status-detail 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -#!/bin/sh -# -# byobu-status-detail -# Copyright (C) 2008 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -if which vim >/dev/null && `vim --version | grep -q +folding`; then - byobu-status --detail | vim -c "set foldmethod=indent" -c "set foldminlines=0" -c "set foldnestmax=1" -c "set foldcolumn=2" -R - -else - byobu-status --detail | $BYOBU_PAGER -fi - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-status-detail.in byobu-5.74/usr/bin/byobu-status-detail.in --- byobu-5.73/usr/bin/byobu-status-detail.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-status-detail.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,31 @@ +#!/bin/sh +# +# byobu-status-detail +# Copyright (C) 2008 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +if which vim >/dev/null && `vim --version | grep -q +folding`; then + byobu-status --detail | vim -c "set foldmethod=indent" -c "set foldminlines=0" -c "set foldnestmax=1" -c "set foldcolumn=2" -R - +else + byobu-status --detail | $BYOBU_PAGER +fi + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/bin/byobu-status.in byobu-5.74/usr/bin/byobu-status.in --- byobu-5.73/usr/bin/byobu-status.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-status.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,144 @@ +#!/bin/sh +# +# byobu-status: byobu's cached status gathering +# +# Copyright (C) 2011 Dustin Kirkland +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +# Make sure status is not disabled +[ -f "$BYOBU_CONFIG_DIR/status.disable" ] && exit 0 + +# Clean and create cache directories +[ -d "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND" ] || mkdir -p "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND" +[ -d "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND" ] || mkdir -p "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND" + +# Source configurations +. "${BYOBU_PREFIX}/lib/${PKG}/include/icons" +for i in "${BYOBU_PREFIX}/share/$PKG/status/status" "${BYOBU_PREFIX}/share/$PKG/status/statusrc" "$BYOBU_CONFIG_DIR/status" "$BYOBU_CONFIG_DIR/statusrc" "$BYOBU_CONFIG_DIR/color" "$BYOBU_CONFIG_DIR/color.tmux"; do + [ -r "$i" ] && . "$i" +done + +case "$BYOBU_BACKEND" in + screen) + # Reload profile, if necessary + if [ -e "/var/run/screen/S-$USER/$PKG.reload-required" ] || [ -e "$BYOBU_RUN_DIR/reload-required" ]; then + if [ -r "$BYOBU_CONFIG_DIR/profile" ]; then + # If the forced janitorial steps succeed, try a profile reload + byobu-janitor --force && screen -X at 0 source "$BYOBU_CONFIG_DIR/profile" >/dev/null 2>&1 + fi + fi + ;; + tmux) + # Fix status printing for small terminal sizes in tmux + width=$(tmux list-windows -F "#{session_width}") + if [ -r "$BYOBU_RUN_DIR/width" ]; then + read w_last < $BYOBU_RUN_DIR/width 2>/dev/null 1>&2 + else + w_last=0 + fi + for w in $width; do + if [ "$w" != "$w_last" ]; then + # go through cat due to possible tmux/epoll bug + tmux set -g status-left-length $(($w*1/4)) | cat >/dev/null 2>&1 + tmux set -g status-right-length $(($w*3/4)) | cat >/dev/null 2>&1 + printf "$w" > $BYOBU_RUN_DIR/width + break + fi + done + ;; +esac + +# Get the current timestamp +get_now; NOW=${_RET} + +get_status() { + local cachepath="$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/$1" + local lastpath="$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND/$1" + local lastrun=0 + [ -r "$lastpath" ] && read lastrun < "$lastpath" + case "$1" in + ip_address4) + local IPV6=0 + local function="ip_address" + ;; + ip_address6) + local IPV6=1 + local function="ip_address" + ;; + *) + local function="$1" + ;; + esac + status_freq "$function" + local expiry=$(($lastrun+$_RET)) + find_script "$function" && . "${_RET}" + # Update cache now, if necessary + if [ $NOW -ge $expiry ] || [ "$lastrun" = "0" ]; then + "__$function" > "$cachepath".new + fi + # Check if we have data in the cache + if [ -s "$cachepath".new ]; then + # Looks like we have an updated cache, use it + mv -f "$cachepath".new "$cachepath" + printf "%s" "$NOW" > "$lastpath" + IFS= read line < "$cachepath"; printf "%s" "$line" + elif [ -s "$cachepath" ]; then + # New cache is empty, but we have data from our last run, use it + IFS= read line < "$cachepath"; printf "%s" "$line" + fi +} + +case "$1" in + *left|*right) + eval items="\$$1" + for i in $items; do + case "$i" in \#*) continue ;; esac + get_status "$i" + done + ;; + --detail) + VER= + if $BYOBU_TEST dpkg-query >/dev/null; then + VER=$(set -- $(dpkg-query --show $PKG); printf "%s\n" "$2") + fi + printf "$PKG-$VER Detailed Status Navigation\n" + if $BYOBU_TEST vim >/dev/null && `vim --version | grep -q +folding`; then + printf " Expand all - zr\t\tCollapse all - zm\n Expand one - zo\t\tCollapse one - zc\n\n" + fi + for i in "$BYOBU_PREFIX/lib/$PKG"/*; do + [ -f "$i" ] || continue + i=${i##*/} + case "$i" in + include|menu|notify_osd|time_binary) continue ;; + esac + find_script "$i" && . "${_RET}" + short=$(eval "__${i}" | $BYOBU_SED -e 's/^\s*//' -e 's/\s*$//' -e 's/.{[^}]*}//g') + detail=$(eval "__${i}_detail" 2>/dev/null | $BYOBU_SED -e '/^$/d' -e 's/^/\t/g') + printf "%s\n\t(%s)\n" "$short" "$i" + [ -n "$detail" ] && printf "%s\n" "$detail" + done + ;; + color) + [ -z "$FOREGROUND" ] && FOREGROUND="w" + [ -z "$BACKGROUND" ] && BACKGROUND="k" + printf "$ESC{= $BACKGROUND$FOREGROUND}" + ;; +esac diff -Nru byobu-5.73/usr/bin/byobu-ugraph byobu-5.74/usr/bin/byobu-ugraph --- byobu-5.73/usr/bin/byobu-ugraph 2013-12-17 02:04:48.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-ugraph 1970-01-01 00:00:00.000000000 +0000 @@ -1,218 +0,0 @@ -#!/bin/bash -#--------------------------------------------------------------------- -# Script to display a byobu notification "history graph". -# -# Designed to work with the wonderful byobu(1) but can be run -# stand-alone. -#--------------------------------------------------------------------- -# -# Copyright (C) 2011 Canonical Ltd. -# -# Author: James Hunt -# -# 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 . -# -#--------------------------------------------------------------------- - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -script_name=${0##*/} -min_default=0 -max_default=100 -points_default=5 -theme_default=vbars_8 -newline="\n" -rotate=y - -error() -{ - msg="$*" - echo "ERROR: $msg" >&2 -} - -die() -{ - error "$*" - exit 1 -} - -usage() -{ -cat < : File to read data points from. - (only required if no command specified). - -h : Show this help. - -m : Minimum value (default=$min_default). - -n : Supress output of newline character. - -p : Specify number of data points in graph - (default=$points_default). - -r : Do not rotate file (default is to rotate). - Option implies file should not be written to - so a command cannot follow script options in this case. - -t : 'byobu-ulevel' theme to use (default=$theme_default). - -x : Maximum value (default=$max_default). - - -Examples: - - Using $script_name to run a command, rotate log and display graph. - - Here we specify a command to display available memory. - Trailing echo adds a required newline - Note no filename specified. - - $script_name "(/usr/lib/byobu/mem_used | sed -e 's/% //g';echo)" - - - Using $script_name just to rotate log and display the graph - - file=/tmp/load.dat - awk '{ print \$1}' /proc/loadavg >> \$file - # Note: we need to specify what we consider to be a "reasonable" maximum load - $script_name -m 3.0 -f \$file - -Notes: - - - If you specify 'command', care must be taken with shell quoting to - avoid expansion prior to this script running the command. - - If '-r' is not specified, the file will be rotated such that - at most lines are retained on each invocation of this - script. - -EOT -} - -get_data() -{ - needed_lines=$points - - if [ ! -f $file ] - then - return - fi - - lines=$(wc -l $file|awk '{print $1}') - - if [ $lines -lt $needed_lines ] - then - # insufficient data - return - fi - - bytes=$(<${file}) - bytes=$(echo "$bytes"|tail -n ${needed_lines}) - [ $lines -eq $needed_lines -o $rotate = n ] && echo "$bytes" && return - - # rotate - tmp=`tempfile` - echo "$bytes" > $tmp - mv $tmp $file - - echo "$bytes" -} - -while getopts "f:hm:np:rt:x:" opt -do - case "$opt" in - f) - file="$OPTARG" - ;; - - h) - usage - exit 0 - ;; - - m) - min=$OPTARG - ;; - - n) - newline= - ;; - - p) - points=$OPTARG - ;; - - r) - rotate=n - ;; - - t) - theme="$OPTARG" - ;; - - x) - max=$OPTARG - ;; - esac -done - -shift $[$OPTIND-1] - -cmd="$@" - -[ -z "$theme" ] && theme=$theme_default - -if [ -z "$cmd" ] -then - if [ -z "$file" ] - then - error "must specify file" - usage - exit 1 - fi -fi - -if [ -z "$file" ] -then - # we could go cryptic+safe by calling tempfile(1), but that then - # makes it very difficult to find in case of need. - file=/tmp/${USER}-${script_name}-$$.dat -fi - -[ -z "$min" ] && min=$min_default -[ -z "$max" ] && max=$max_default -[ -z "$points" ] && points=$points_default - -if [ ! -z "$cmd" ] -then - if [ $rotate = n ] - then - error "cannot write to file if rotate disabled" - usage - exit 1 - fi - - eval "$cmd >>$file" -fi - -data=$(get_data) - -[ -z "$data" ] && printf "%*.s${newline}" $points && exit 0 - -for datum in $data -do - byobu-ulevel -n -m $min -x $max -p -c $datum -t $theme -done diff -Nru byobu-5.73/usr/bin/byobu-ugraph.in byobu-5.74/usr/bin/byobu-ugraph.in --- byobu-5.73/usr/bin/byobu-ugraph.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-ugraph.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,218 @@ +#!/bin/bash +#--------------------------------------------------------------------- +# Script to display a byobu notification "history graph". +# +# Designed to work with the wonderful byobu(1) but can be run +# stand-alone. +#--------------------------------------------------------------------- +# +# Copyright (C) 2011 Canonical Ltd. +# +# Author: James Hunt +# +# 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 . +# +#--------------------------------------------------------------------- + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +script_name=${0##*/} +min_default=0 +max_default=100 +points_default=5 +theme_default=vbars_8 +newline="\n" +rotate=y + +error() +{ + msg="$*" + echo "ERROR: $msg" >&2 +} + +die() +{ + error "$*" + exit 1 +} + +usage() +{ +cat < : File to read data points from. + (only required if no command specified). + -h : Show this help. + -m : Minimum value (default=$min_default). + -n : Supress output of newline character. + -p : Specify number of data points in graph + (default=$points_default). + -r : Do not rotate file (default is to rotate). + Option implies file should not be written to + so a command cannot follow script options in this case. + -t : 'byobu-ulevel' theme to use (default=$theme_default). + -x : Maximum value (default=$max_default). + + +Examples: + + Using $script_name to run a command, rotate log and display graph. + + Here we specify a command to display available memory. + Trailing echo adds a required newline + Note no filename specified. + + $script_name "(@prefix@/lib/byobu/mem_used | sed -e 's/% //g';echo)" + + + Using $script_name just to rotate log and display the graph + + file=/tmp/load.dat + awk '{ print \$1}' /proc/loadavg >> \$file + # Note: we need to specify what we consider to be a "reasonable" maximum load + $script_name -m 3.0 -f \$file + +Notes: + + - If you specify 'command', care must be taken with shell quoting to + avoid expansion prior to this script running the command. + - If '-r' is not specified, the file will be rotated such that + at most lines are retained on each invocation of this + script. + +EOT +} + +get_data() +{ + needed_lines=$points + + if [ ! -f $file ] + then + return + fi + + lines=$(wc -l $file|awk '{print $1}') + + if [ $lines -lt $needed_lines ] + then + # insufficient data + return + fi + + bytes=$(<${file}) + bytes=$(echo "$bytes"|tail -n ${needed_lines}) + [ $lines -eq $needed_lines -o $rotate = n ] && echo "$bytes" && return + + # rotate + tmp=`tempfile` + echo "$bytes" > $tmp + mv $tmp $file + + echo "$bytes" +} + +while getopts "f:hm:np:rt:x:" opt +do + case "$opt" in + f) + file="$OPTARG" + ;; + + h) + usage + exit 0 + ;; + + m) + min=$OPTARG + ;; + + n) + newline= + ;; + + p) + points=$OPTARG + ;; + + r) + rotate=n + ;; + + t) + theme="$OPTARG" + ;; + + x) + max=$OPTARG + ;; + esac +done + +shift $[$OPTIND-1] + +cmd="$@" + +[ -z "$theme" ] && theme=$theme_default + +if [ -z "$cmd" ] +then + if [ -z "$file" ] + then + error "must specify file" + usage + exit 1 + fi +fi + +if [ -z "$file" ] +then + # we could go cryptic+safe by calling tempfile(1), but that then + # makes it very difficult to find in case of need. + file=/tmp/${USER}-${script_name}-$$.dat +fi + +[ -z "$min" ] && min=$min_default +[ -z "$max" ] && max=$max_default +[ -z "$points" ] && points=$points_default + +if [ ! -z "$cmd" ] +then + if [ $rotate = n ] + then + error "cannot write to file if rotate disabled" + usage + exit 1 + fi + + eval "$cmd >>$file" +fi + +data=$(get_data) + +[ -z "$data" ] && printf "%*.s${newline}" $points && exit 0 + +for datum in $data +do + byobu-ulevel -n -m $min -x $max -p -c $datum -t $theme +done diff -Nru byobu-5.73/usr/bin/byobu-ulevel byobu-5.74/usr/bin/byobu-ulevel --- byobu-5.73/usr/bin/byobu-ulevel 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-ulevel 1970-01-01 00:00:00.000000000 +0000 @@ -1,538 +0,0 @@ -#!/bin/bash -#--------------------------------------------------------------------- -# Script to display unicode characters representing the level of -# some indicator. -# -# Designed to work with the wonderful byobu(1) but can be run -# stand-alone. -#--------------------------------------------------------------------- -# -# Copyright (C) 2011 Canonical Ltd. -# -# Author: James Hunt -# -# 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 . -# -#--------------------------------------------------------------------- - -#------------------------------ -# Themes with 2 values. -# -# Two-value themes are handled differently to other n-value types of -# theme: the first array entry in each theme is generally some unfilled -# glyph, denoting an "off" value and the second value is the filled -# version of the unfilled glyph and denotes an "on" value. Note that -# you can always change the ordering of these values using the 'invert' -# command-line option. - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" - -circles_2=(○ ●) -diamonds_2=(◇ ◆) -flags_2=(⚐ ⚑) -hearts_2=(♡ ♥) -squares_2=(◻ ◼) -squares_small_2=(◽ ◾) -stars_2=(☆ ★) -faces_2=(☹ ☺) - -#------------------------------ -# Themes with 4 values. - -vdots_thick_4=(⣀ ⣤ ⣶ ⣿) -vdots_thin_4=(⢀ ⢠ ⢰ ⢸) -fractions_4=(¼ ½ ¾ ¹) -quadrants_4=(◔ ◑ ◕ ●) -shades_4=(░ ▒ ▓ █) - -#------------------------------ -# Themes with 5 values. - -circles_5=(◦ ○ ◎ ◉ ●) - -#------------------------------ -# Themes with 6 values. - -dice_6=(⚀ ⚁ ⚂ ⚃ ⚄ ⚅) - -#------------------------------ -# Themes with 8 values. - -hbars_8=(▏ ▎ ▍ ▌ ▋ ▊ ▉ █) -vbars_8=(▁ ▂ ▃ ▄ ▅ ▆ ▇ █) - -#------------------------------ -# Themes with 10 values. - -circle_number_10=(➀ ➁ ➂ ➃ ➄ ➅ ➆ ➇ ➈ ➉) -solid_numbers_a_10=(➊ ➋ ➌ ➍ ➎ ➏ ➐ ➑ ➒ ➓) -solid_numbers_b_10=(❶ ❷ ❸ ❹ ❺ ❻ ❼ ❽ ❾ ❿) - -#------------------------------ -# XXX: remember to update if you add new themes above! - -theme_list=\ -( - 'circles_2 diamonds_2 flags_2 hearts_2 squares_2 squares_small_2 stars_2' - 'vdots_thick_4 vdots_thin_4 fractions_4 quadrants_4 shades_4' - 'circles_5' - 'dice_6' - 'hbars_8 vbars_8' - 'circle_number_10 solid_numbers_a_10 solid_numbers_b_10' -) - -#------------------------------ - -default_decimal_places=2 -a11y=n -a11y_variable=BYOBU_A11Y -debug_enabled=n -newline= -list=n -quiet=n -invert=n -reverse=n -script_name=${0##*/} -min_default=0 -max_default=100 -width_default=5 -zero_as_space=n -theme_default=vbars_8 -permissive=n - -debug() -{ - msg="$*" - [ $debug_enabled = y ] && echo "DEBUG: $msg" -} - -error() -{ - msg="$*" - echo "ERROR: $msg" >&2 -} - -die() -{ - error "$*" - exit 1 -} - -check_a11y() -{ - eval result="\$$a11y_variable" - [ ! -z "$result" ] && a11y=y -} - -# return 1 if expression specified is true (no return if false) -bc_test() -{ - expr="$*" - echo $(echo "if ( $expr ) { print \"1\" }"|bc -l) -} - -assert() -{ - expr="$1" - str="$2" - - debug "assert: expr='$expr'" - ret=$(bc_test "$expr") - - [ ! -z "$ret" ] && return - - die "$str" -} - -usage() -{ -cat < - $script_name [options] - $script_name - -Options: - - -a : Accessibility mode: only output ASCII. - (Also enabled if variable '$a11y_variable' set). - -b : Display current value as space if zero, rather than lowest - 'value' of theme. - -c : Current value of your indicator. - -d : Enable debug output. - -e : Number of decimal places to use for accessibility mode - (default=$default_decimal_places). - -h : Show this help. - -i : Invert colour scheme (rating themes only). - -l : List available themes. If '-t' also specified, - show all values for specified theme. - -m : Minimum value (default=$min_default). - -n : Supress output of newline character. - -p : Permissive mode - if current value out of bounds, set it - to the nearest bound (min or max). - -q : Suppress messages (requires '-t'). - -r : Reverse 'direction' of display (rating theme only). - -t : Name of theme (default=$theme_default). - -u : Specify a user theme (2 or more values). - -w : Width of rating theme (default=$width_default). - -x : Maximum value (default=$max_default). - - -Examples: - - # Display character representing 27% using default theme. - $script_name 27 - - # As above. - $script_name -c 27 - - # Example showing floating-point and negative values. - $script_name -c 1.100001 -m -5.00234 -x 2.71828 -t dice_6 - - # Use accessibility mode to display a percentage value - # (rounded to nearest percentage) - $script_name -m -22.613 -x 5.00212 -c 0.10203 -a -e 0 - - # Display value using a "rating theme" (displayed left-to-right). - $script_name -c 83 -t stars_2 - - # Display right-to-left inverted "rating theme". - $script_name -c 60 -t diamonds_2 -ri - - # Display all glyphs in 'solid_numbers_a_10' theme. - $script_name -l -t solid_numbers_a_10 - - # Display a user-specified rating theme 10 glyphs wide. - $script_name -c 666.321 -m -273.15 -x 1370 -u "· ☢" -w 10 - - # A multi-element user theme (this prints 'e'). - $script_name -c 50 -u "a b c d e f g h i j" - - -Notes: - - - Arguments of type "" denote an integer value, whereas arguments - of type "" denotes either an integer or a floating-point - number. - - The final '_' in a theme name denotes the number of glyphs - in it. - - "Rating themes" are those with only 2 values. - - The argument to '-u' must contain space-delimited - characters. - -EOT -} - -# this is horribly inefficient - we should probably do some clever -# tricks using printf formats to avoid the silly while loop. -# Additionally, it is rather similar to show_theme_entry() but was split -# out from that in a vain attempt to make the overall logic clearer :) -show_rating_theme() -{ - theme="$1" - min="$2" - max="$3" - current="$4" - percent="$5" - - if [ $invert = n ] - then - on=1 - off=0 - else - on=0 - off=1 - fi - - debug "width=$width" - debug "percent=$percent" - - percent_per_glyph=$(echo "scale=4;100/${width}"|bc -l) - assert "$percent_per_glyph > 1.0" "width ($width) too great" - debug "percent_per_glyph=$percent_per_glyph" - - debug "glyph_count=$glyph_count" - - g=$percent_per_glyph - i=0 - value="" - while [ $i -lt $width ] - do - if [ ! -z "$(bc_test "$g <= $percent")" ] - then - eval content="\${$theme[${on}]}" - else - eval content="\${$theme[${off}]}" - fi - if [ $reverse = n ] - then - value="${value}${content}" - else - value="${content}${value}" - fi - g=$(echo "$g + $percent_per_glyph"|bc -l) - i=$((i + 1)) - done - echo $newline "$value" -} - -show_theme_entry() -{ - theme="$1" - min="$2" - max="$3" - current="$4" - - debug "theme=$theme" - debug "min=$min" - debug "max=$max" - debug "current=$current" - - range=$(echo "($max - $min)"|bc -l) - - quotient=$(echo "scale=4;((${current} - ${min})/${range})"|bc -l) - percent=$(echo "$quotient * 100"|bc -l) - - glyph_count=$(echo $theme|awk -F\_ '{print $NF}') - - debug "range=$range" - debug "quotient=$quotient" - debug "percent=$percent" - debug "glyph_count=$glyph_count" - - # just ASCII please - if [ $a11y = y ] - then - [ -z "$decimal_places" ] && decimal_places=$default_decimal_places - val=$(echo|awk -v p=$percent -v dp=$decimal_places '{printf("%.*f", dp, p)}') - echo $newline "$val" - return - fi - - if [ $glyph_count -eq 2 ] - then - show_rating_theme "$theme" "$min" "$max" "$current" "$percent" - return - fi - - percent_per_glyph=$(echo "100/$glyph_count"|bc -l) - debug "percent_per_glyph=$percent_per_glyph" - - assert "$percent_per_glyph > 1.0" "width ($width) too great" - - # with this scheme, assuming current value is 0-100 and theme has 10 - # elements: - # - # current glyph from theme - # - # 0-19 1st - # 20-29 2nd - # 30-39 3rd - # : - # 90-99 9th - # 100 10th - i=$(echo|awk \ - -v quotient=$quotient \ - -v glyph_count=$glyph_count \ - '{ - x= int( (quotient * glyph_count) ) - 1; - x = (x > (glyph_count-1) ? (glyph_count-1) : x); - if ( x < 0 ) x = 0; - printf("%d", x); - }') - - debug "index=$i" - eval content="\${$theme[$i]}" - - [ ! -z "$(bc_test "$current == 0")" -a $zero_as_space = y ] && content=' ' - echo $newline "$content" - - return -} - -list_theme() -{ - theme="$1" - eval content="\${$theme[@]}" - echo - for c in $content - do - printf "$c " - done - echo -e "\n" -} - -list_themes() -{ - for entry in ${theme_list[@]} - do - for arg in "$entry" - do - echo "$arg" - done - done -} - -theme_valid() -{ - theme="$1" - [ -z "`list_themes|grep "^${theme}$"`" ] && return 1 - return 0 -} - -check_a11y - -# XXX: the seemingly pointless 'tr' calls translate unicode dashes (look -# closely!) into ASCII dashes. This is required since 'bc' borks on -# unicode and it is easy to mistakenly pass unicode dashes if you paste -# characters from another application, such as a web-browser. -while getopts "abc:de:hilm:npqrt:u:w:x:" opt -do - case "$opt" in - a) - a11y=y - ;; - - b) - zero_as_space=y - ;; - - c) - current=$(echo $OPTARG|tr '−' '-') - ;; - - d) - debug_enabled=y - ;; - - e) - decimal_places=$OPTARG - ;; - - h) - usage - exit 0 - ;; - - i) - invert=y - ;; - - l) - list=y - ;; - - m) - min=$(echo $OPTARG|tr '−' '-') - ;; - - n) - newline=-n - ;; - - p) - permissive=y - ;; - - q) - quiet=y - ;; - - r) - reverse=y - ;; - - t) - theme=$OPTARG - ;; - - u) - user_theme="$OPTARG" - ;; - - w) - width=$OPTARG - ;; - - x) - max=$(echo $OPTARG|tr '−' '-') - ;; - esac -done - -shift $[$OPTIND-1] - -if [ ! -z "$user_theme" ] -then - elements=$(echo "$user_theme"|awk '{print NF}') - - assert "$elements >= 2" "user themes need >= 2 values" - - # create new theme - name="_user_${elements}" - eval "$name=($user_theme)" - - # add it to list - theme_list=("${theme_list[@]}" $name) - - [ -z "$theme" ] && theme=$name -fi - -if [ "$list" = y ] -then - if [ -z "$theme" ] - then - list_themes && exit 0 - else - theme_valid "$theme" || die "invalid theme: $theme" - [ "$quiet" = n ] && echo "Listing theme '$theme'" - list_theme $theme && exit 0 - fi -fi -[ -z "$min" ] && min=$min_default -[ -z "$max" ] && max=$max_default -[ -z "$width" ] && width=$width_default - -assert "$min <= $max" "minimum ($min) > maximum ($max)" -assert "$min != $max" "minimum ($min) == maximum" - -[ -z "$current" -a ! -z "$1" ] && current="$1" - -if [ -z "$current" ] -then - error "must specify current value" - usage - exit 1 -fi - -if [ $permissive = n ] -then - assert "$current >= $min" "current ($current) < minimum ($min)" - assert "$current <= $max" "current ($current) > maximum ($max)" -else - [ ! -z "$(bc_test "$current < $min")" ] && current=$min - [ ! -z "$(bc_test "$current > $max")" ] && current=$max -fi - -[ -z "$theme" ] && theme=$theme_default - -theme_valid "$theme" || die "invalid theme: $theme" - -show_theme_entry $theme $min $max $current - -exit 0 diff -Nru byobu-5.73/usr/bin/byobu-ulevel.in byobu-5.74/usr/bin/byobu-ulevel.in --- byobu-5.73/usr/bin/byobu-ulevel.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/bin/byobu-ulevel.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,538 @@ +#!/bin/bash +#--------------------------------------------------------------------- +# Script to display unicode characters representing the level of +# some indicator. +# +# Designed to work with the wonderful byobu(1) but can be run +# stand-alone. +#--------------------------------------------------------------------- +# +# Copyright (C) 2011 Canonical Ltd. +# +# Author: James Hunt +# +# 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 . +# +#--------------------------------------------------------------------- + +#------------------------------ +# Themes with 2 values. +# +# Two-value themes are handled differently to other n-value types of +# theme: the first array entry in each theme is generally some unfilled +# glyph, denoting an "off" value and the second value is the filled +# version of the unfilled glyph and denotes an "on" value. Note that +# you can always change the ordering of these values using the 'invert' +# command-line option. + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" + +circles_2=(○ ●) +diamonds_2=(◇ ◆) +flags_2=(⚐ ⚑) +hearts_2=(♡ ♥) +squares_2=(◻ ◼) +squares_small_2=(◽ ◾) +stars_2=(☆ ★) +faces_2=(☹ ☺) + +#------------------------------ +# Themes with 4 values. + +vdots_thick_4=(⣀ ⣤ ⣶ ⣿) +vdots_thin_4=(⢀ ⢠ ⢰ ⢸) +fractions_4=(¼ ½ ¾ ¹) +quadrants_4=(◔ ◑ ◕ ●) +shades_4=(░ ▒ ▓ █) + +#------------------------------ +# Themes with 5 values. + +circles_5=(◦ ○ ◎ ◉ ●) + +#------------------------------ +# Themes with 6 values. + +dice_6=(⚀ ⚁ ⚂ ⚃ ⚄ ⚅) + +#------------------------------ +# Themes with 8 values. + +hbars_8=(▏ ▎ ▍ ▌ ▋ ▊ ▉ █) +vbars_8=(▁ ▂ ▃ ▄ ▅ ▆ ▇ █) + +#------------------------------ +# Themes with 10 values. + +circle_number_10=(➀ ➁ ➂ ➃ ➄ ➅ ➆ ➇ ➈ ➉) +solid_numbers_a_10=(➊ ➋ ➌ ➍ ➎ ➏ ➐ ➑ ➒ ➓) +solid_numbers_b_10=(❶ ❷ ❸ ❹ ❺ ❻ ❼ ❽ ❾ ❿) + +#------------------------------ +# XXX: remember to update if you add new themes above! + +theme_list=\ +( + 'circles_2 diamonds_2 flags_2 hearts_2 squares_2 squares_small_2 stars_2' + 'vdots_thick_4 vdots_thin_4 fractions_4 quadrants_4 shades_4' + 'circles_5' + 'dice_6' + 'hbars_8 vbars_8' + 'circle_number_10 solid_numbers_a_10 solid_numbers_b_10' +) + +#------------------------------ + +default_decimal_places=2 +a11y=n +a11y_variable=BYOBU_A11Y +debug_enabled=n +newline= +list=n +quiet=n +invert=n +reverse=n +script_name=${0##*/} +min_default=0 +max_default=100 +width_default=5 +zero_as_space=n +theme_default=vbars_8 +permissive=n + +debug() +{ + msg="$*" + [ $debug_enabled = y ] && echo "DEBUG: $msg" +} + +error() +{ + msg="$*" + echo "ERROR: $msg" >&2 +} + +die() +{ + error "$*" + exit 1 +} + +check_a11y() +{ + eval result="\$$a11y_variable" + [ ! -z "$result" ] && a11y=y +} + +# return 1 if expression specified is true (no return if false) +bc_test() +{ + expr="$*" + echo $(echo "if ( $expr ) { print \"1\" }"|bc -l) +} + +assert() +{ + expr="$1" + str="$2" + + debug "assert: expr='$expr'" + ret=$(bc_test "$expr") + + [ ! -z "$ret" ] && return + + die "$str" +} + +usage() +{ +cat < + $script_name [options] + $script_name + +Options: + + -a : Accessibility mode: only output ASCII. + (Also enabled if variable '$a11y_variable' set). + -b : Display current value as space if zero, rather than lowest + 'value' of theme. + -c : Current value of your indicator. + -d : Enable debug output. + -e : Number of decimal places to use for accessibility mode + (default=$default_decimal_places). + -h : Show this help. + -i : Invert colour scheme (rating themes only). + -l : List available themes. If '-t' also specified, + show all values for specified theme. + -m : Minimum value (default=$min_default). + -n : Supress output of newline character. + -p : Permissive mode - if current value out of bounds, set it + to the nearest bound (min or max). + -q : Suppress messages (requires '-t'). + -r : Reverse 'direction' of display (rating theme only). + -t : Name of theme (default=$theme_default). + -u : Specify a user theme (2 or more values). + -w : Width of rating theme (default=$width_default). + -x : Maximum value (default=$max_default). + + +Examples: + + # Display character representing 27% using default theme. + $script_name 27 + + # As above. + $script_name -c 27 + + # Example showing floating-point and negative values. + $script_name -c 1.100001 -m -5.00234 -x 2.71828 -t dice_6 + + # Use accessibility mode to display a percentage value + # (rounded to nearest percentage) + $script_name -m -22.613 -x 5.00212 -c 0.10203 -a -e 0 + + # Display value using a "rating theme" (displayed left-to-right). + $script_name -c 83 -t stars_2 + + # Display right-to-left inverted "rating theme". + $script_name -c 60 -t diamonds_2 -ri + + # Display all glyphs in 'solid_numbers_a_10' theme. + $script_name -l -t solid_numbers_a_10 + + # Display a user-specified rating theme 10 glyphs wide. + $script_name -c 666.321 -m -273.15 -x 1370 -u "· ☢" -w 10 + + # A multi-element user theme (this prints 'e'). + $script_name -c 50 -u "a b c d e f g h i j" + + +Notes: + + - Arguments of type "" denote an integer value, whereas arguments + of type "" denotes either an integer or a floating-point + number. + - The final '_' in a theme name denotes the number of glyphs + in it. + - "Rating themes" are those with only 2 values. + - The argument to '-u' must contain space-delimited + characters. + +EOT +} + +# this is horribly inefficient - we should probably do some clever +# tricks using printf formats to avoid the silly while loop. +# Additionally, it is rather similar to show_theme_entry() but was split +# out from that in a vain attempt to make the overall logic clearer :) +show_rating_theme() +{ + theme="$1" + min="$2" + max="$3" + current="$4" + percent="$5" + + if [ $invert = n ] + then + on=1 + off=0 + else + on=0 + off=1 + fi + + debug "width=$width" + debug "percent=$percent" + + percent_per_glyph=$(echo "scale=4;100/${width}"|bc -l) + assert "$percent_per_glyph > 1.0" "width ($width) too great" + debug "percent_per_glyph=$percent_per_glyph" + + debug "glyph_count=$glyph_count" + + g=$percent_per_glyph + i=0 + value="" + while [ $i -lt $width ] + do + if [ ! -z "$(bc_test "$g <= $percent")" ] + then + eval content="\${$theme[${on}]}" + else + eval content="\${$theme[${off}]}" + fi + if [ $reverse = n ] + then + value="${value}${content}" + else + value="${content}${value}" + fi + g=$(echo "$g + $percent_per_glyph"|bc -l) + i=$((i + 1)) + done + echo $newline "$value" +} + +show_theme_entry() +{ + theme="$1" + min="$2" + max="$3" + current="$4" + + debug "theme=$theme" + debug "min=$min" + debug "max=$max" + debug "current=$current" + + range=$(echo "($max - $min)"|bc -l) + + quotient=$(echo "scale=4;((${current} - ${min})/${range})"|bc -l) + percent=$(echo "$quotient * 100"|bc -l) + + glyph_count=$(echo $theme|awk -F\_ '{print $NF}') + + debug "range=$range" + debug "quotient=$quotient" + debug "percent=$percent" + debug "glyph_count=$glyph_count" + + # just ASCII please + if [ $a11y = y ] + then + [ -z "$decimal_places" ] && decimal_places=$default_decimal_places + val=$(echo|awk -v p=$percent -v dp=$decimal_places '{printf("%.*f", dp, p)}') + echo $newline "$val" + return + fi + + if [ $glyph_count -eq 2 ] + then + show_rating_theme "$theme" "$min" "$max" "$current" "$percent" + return + fi + + percent_per_glyph=$(echo "100/$glyph_count"|bc -l) + debug "percent_per_glyph=$percent_per_glyph" + + assert "$percent_per_glyph > 1.0" "width ($width) too great" + + # with this scheme, assuming current value is 0-100 and theme has 10 + # elements: + # + # current glyph from theme + # + # 0-19 1st + # 20-29 2nd + # 30-39 3rd + # : + # 90-99 9th + # 100 10th + i=$(echo|awk \ + -v quotient=$quotient \ + -v glyph_count=$glyph_count \ + '{ + x= int( (quotient * glyph_count) ) - 1; + x = (x > (glyph_count-1) ? (glyph_count-1) : x); + if ( x < 0 ) x = 0; + printf("%d", x); + }') + + debug "index=$i" + eval content="\${$theme[$i]}" + + [ ! -z "$(bc_test "$current == 0")" -a $zero_as_space = y ] && content=' ' + echo $newline "$content" + + return +} + +list_theme() +{ + theme="$1" + eval content="\${$theme[@]}" + echo + for c in $content + do + printf "$c " + done + echo -e "\n" +} + +list_themes() +{ + for entry in ${theme_list[@]} + do + for arg in "$entry" + do + echo "$arg" + done + done +} + +theme_valid() +{ + theme="$1" + [ -z "`list_themes|grep "^${theme}$"`" ] && return 1 + return 0 +} + +check_a11y + +# XXX: the seemingly pointless 'tr' calls translate unicode dashes (look +# closely!) into ASCII dashes. This is required since 'bc' borks on +# unicode and it is easy to mistakenly pass unicode dashes if you paste +# characters from another application, such as a web-browser. +while getopts "abc:de:hilm:npqrt:u:w:x:" opt +do + case "$opt" in + a) + a11y=y + ;; + + b) + zero_as_space=y + ;; + + c) + current=$(echo $OPTARG|tr '−' '-') + ;; + + d) + debug_enabled=y + ;; + + e) + decimal_places=$OPTARG + ;; + + h) + usage + exit 0 + ;; + + i) + invert=y + ;; + + l) + list=y + ;; + + m) + min=$(echo $OPTARG|tr '−' '-') + ;; + + n) + newline=-n + ;; + + p) + permissive=y + ;; + + q) + quiet=y + ;; + + r) + reverse=y + ;; + + t) + theme=$OPTARG + ;; + + u) + user_theme="$OPTARG" + ;; + + w) + width=$OPTARG + ;; + + x) + max=$(echo $OPTARG|tr '−' '-') + ;; + esac +done + +shift $[$OPTIND-1] + +if [ ! -z "$user_theme" ] +then + elements=$(echo "$user_theme"|awk '{print NF}') + + assert "$elements >= 2" "user themes need >= 2 values" + + # create new theme + name="_user_${elements}" + eval "$name=($user_theme)" + + # add it to list + theme_list=("${theme_list[@]}" $name) + + [ -z "$theme" ] && theme=$name +fi + +if [ "$list" = y ] +then + if [ -z "$theme" ] + then + list_themes && exit 0 + else + theme_valid "$theme" || die "invalid theme: $theme" + [ "$quiet" = n ] && echo "Listing theme '$theme'" + list_theme $theme && exit 0 + fi +fi +[ -z "$min" ] && min=$min_default +[ -z "$max" ] && max=$max_default +[ -z "$width" ] && width=$width_default + +assert "$min <= $max" "minimum ($min) > maximum ($max)" +assert "$min != $max" "minimum ($min) == maximum" + +[ -z "$current" -a ! -z "$1" ] && current="$1" + +if [ -z "$current" ] +then + error "must specify current value" + usage + exit 1 +fi + +if [ $permissive = n ] +then + assert "$current >= $min" "current ($current) < minimum ($min)" + assert "$current <= $max" "current ($current) > maximum ($max)" +else + [ ! -z "$(bc_test "$current < $min")" ] && current=$min + [ ! -z "$(bc_test "$current > $max")" ] && current=$max +fi + +[ -z "$theme" ] && theme=$theme_default + +theme_valid "$theme" || die "invalid theme: $theme" + +show_theme_entry $theme $min $max $current + +exit 0 diff -Nru byobu-5.73/usr/bin/Makefile.in byobu-5.74/usr/bin/Makefile.in --- byobu-5.73/usr/bin/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/bin/Makefile.in 2014-03-16 19:45:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -77,13 +77,36 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = usr/bin -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/byobu.in $(srcdir)/byobu-config.in \ + $(srcdir)/byobu-ctrl-a.in $(srcdir)/byobu-disable.in \ + $(srcdir)/byobu-disable-prompt.in $(srcdir)/byobu-enable.in \ + $(srcdir)/byobu-enable-prompt.in $(srcdir)/byobu-export.in \ + $(srcdir)/byobu-janitor.in $(srcdir)/byobu-launch.in \ + $(srcdir)/byobu-launcher.in \ + $(srcdir)/byobu-launcher-install.in \ + $(srcdir)/byobu-launcher-uninstall.in \ + $(srcdir)/byobu-layout.in $(srcdir)/byobu-prompt.in \ + $(srcdir)/byobu-quiet.in $(srcdir)/byobu-reconnect-sockets.in \ + $(srcdir)/byobu-select-backend.in \ + $(srcdir)/byobu-select-profile.in \ + $(srcdir)/byobu-select-session.in $(srcdir)/byobu-shell.in \ + $(srcdir)/byobu-silent.in $(srcdir)/byobu-status.in \ + $(srcdir)/byobu-status-detail.in $(srcdir)/byobu-ugraph.in \ + $(srcdir)/byobu-ulevel.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = byobu byobu-config byobu-ctrl-a byobu-disable \ + byobu-disable-prompt byobu-enable byobu-enable-prompt \ + byobu-export byobu-janitor byobu-launch byobu-launcher \ + byobu-launcher-install byobu-launcher-uninstall byobu-layout \ + byobu-prompt byobu-quiet byobu-reconnect-sockets \ + byobu-select-backend byobu-select-profile byobu-select-session \ + byobu-shell byobu-silent byobu-status byobu-status-detail \ + byobu-ugraph byobu-ulevel CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -243,6 +266,58 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +byobu: $(top_builddir)/config.status $(srcdir)/byobu.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-config: $(top_builddir)/config.status $(srcdir)/byobu-config.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-ctrl-a: $(top_builddir)/config.status $(srcdir)/byobu-ctrl-a.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-disable: $(top_builddir)/config.status $(srcdir)/byobu-disable.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-disable-prompt: $(top_builddir)/config.status $(srcdir)/byobu-disable-prompt.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-enable: $(top_builddir)/config.status $(srcdir)/byobu-enable.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-enable-prompt: $(top_builddir)/config.status $(srcdir)/byobu-enable-prompt.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-export: $(top_builddir)/config.status $(srcdir)/byobu-export.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-janitor: $(top_builddir)/config.status $(srcdir)/byobu-janitor.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-launch: $(top_builddir)/config.status $(srcdir)/byobu-launch.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-launcher: $(top_builddir)/config.status $(srcdir)/byobu-launcher.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-launcher-install: $(top_builddir)/config.status $(srcdir)/byobu-launcher-install.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-launcher-uninstall: $(top_builddir)/config.status $(srcdir)/byobu-launcher-uninstall.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-layout: $(top_builddir)/config.status $(srcdir)/byobu-layout.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-prompt: $(top_builddir)/config.status $(srcdir)/byobu-prompt.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-quiet: $(top_builddir)/config.status $(srcdir)/byobu-quiet.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-reconnect-sockets: $(top_builddir)/config.status $(srcdir)/byobu-reconnect-sockets.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-select-backend: $(top_builddir)/config.status $(srcdir)/byobu-select-backend.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-select-profile: $(top_builddir)/config.status $(srcdir)/byobu-select-profile.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-select-session: $(top_builddir)/config.status $(srcdir)/byobu-select-session.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-shell: $(top_builddir)/config.status $(srcdir)/byobu-shell.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-silent: $(top_builddir)/config.status $(srcdir)/byobu-silent.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-status: $(top_builddir)/config.status $(srcdir)/byobu-status.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-status-detail: $(top_builddir)/config.status $(srcdir)/byobu-status-detail.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-ugraph: $(top_builddir)/config.status $(srcdir)/byobu-ugraph.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +byobu-ulevel: $(top_builddir)/config.status $(srcdir)/byobu-ulevel.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ diff -Nru byobu-5.73/usr/lib/byobu/battery byobu-5.74/usr/lib/byobu/battery --- byobu-5.73/usr/lib/byobu/battery 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/lib/byobu/battery 2014-02-28 23:14:03.000000000 +0000 @@ -37,9 +37,10 @@ /sys/*) if [ -r "$bat/uevent" ]; then . "$bat/uevent" - [ "$POWER_SUPPLY_NAME" = "AC" ] && continue + case "$POWER_SUPPLY_NAME" in AC|ac|Ac|aC) continue ;; esac present="$POWER_SUPPLY_PRESENT" - # Some use "CHARGE", others use "ENERGY" + # Some use "CHARGE", others use "ENERGY", still others "CAPACITY" + [ -n "$POWER_SUPPLY_CAPACITY" ] && rem="$POWER_SUPPLY_CAPACITY" && full="100" [ -n "$POWER_SUPPLY_CHARGE_FULL" ] && full="$POWER_SUPPLY_CHARGE_FULL" [ -n "$POWER_SUPPLY_ENERGY_FULL" ] && full="$POWER_SUPPLY_ENERGY_FULL" [ -n "$POWER_SUPPLY_CHARGE_NOW" ] && rem="$POWER_SUPPLY_CHARGE_NOW" @@ -86,10 +87,12 @@ bcolor="b G k" fi percent="${percent}${PCT}" + # Convert state to lower case + state=$(printf "%s" "$state" | $BYOBU_SED 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/') case $state in - charging|Charging|Unknown) sign="+" ;; - discharging|Discharging) sign="-" ;; - charged|Unknown|Full) sign="="; percent="" ;; + charging) sign="+" ;; + discharging) sign="-" ;; + charged|unknown|full) sign="=" ;; *) sign="$state" ;; esac if [ -z "$percent" ]; then diff -Nru byobu-5.73/usr/lib/byobu/include/config.py byobu-5.74/usr/lib/byobu/include/config.py --- byobu-5.73/usr/lib/byobu/include/config.py 2013-12-06 13:39:33.000000000 +0000 +++ byobu-5.74/usr/lib/byobu/include/config.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,385 +0,0 @@ -#!/usr/bin/python -# -# config.py -# Copyright (C) 2008 Canonical Ltd. -# Copyright (C) 2008-2013 Dustin Kirkland - -# -# Authors: Nick Barcet -# Dustin Kirkland -# -# 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 . - -# If you change any strings, please generate localization information with: -# ./debian/rules get-po - -import sys -import os -import os.path -import time -import string -import subprocess -import gettext -import glob - - -def error(msg): - print("ERROR: %s" % msg) - sys.exit(1) - - -try: - import snack - from snack import * -except: - error("Could not import the python snack module") - - -PKG = "byobu" -HOME = os.getenv("HOME") -USER = os.getenv("USER") -BYOBU_CONFIG_DIR = os.getenv("BYOBU_CONFIG_DIR", HOME + "/.byobu") -BYOBU_RUN_DIR = os.getenv("BYOBU_RUN_DIR", HOME + "/.cache/byobu") -BYOBU_BACKEND = os.getenv("BYOBU_BACKEND", "tmux") -BYOBU_SOCKETDIR = os.getenv("SOCKETDIR", "/var/run/screen") -BYOBU_PREFIX = os.getenv("BYOBU_PREFIX", "/usr") -SHARE = BYOBU_PREFIX + '/share/' + PKG -DOC = BYOBU_PREFIX + '/share/doc/' + PKG -if not os.path.exists(SHARE): - SHARE = BYOBU_CONFIG_DIR + "/" + SHARE -if not os.path.exists(DOC): - DOC = BYOBU_CONFIG_DIR + "/" + DOC -DEF_ESC = "A" -RELOAD = "If you are using the default set of keybindings, press\n or to activate these changes.\n\nOtherwise, exit this session and start a new one." -RELOAD_FLAG = "%s/reload-required" % (BYOBU_RUN_DIR) -ESC = '' -snack.hotkeys[ESC] = ord(ESC) -snack.hotkeys[ord(ESC)] = ESC -gettext.bindtextdomain(PKG, SHARE + '/po') -gettext.textdomain(PKG) -_ = gettext.gettext - - -def ioctl_GWINSZ(fd): - # Discover terminal width - try: - import fcntl - import termios - import struct - import os - cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234')) - except: - return None - return cr - - -def reload_required(): - try: - if not os.path.exists(BYOBU_CONFIG_DIR): - # 493 (decimal) is 0755 (octal) - # Use decimal for portability across all python versions - os.makedirs(BYOBU_CONFIG_DIR, 493) - f = open(RELOAD_FLAG, 'w') - f.close() - if BYOBU_BACKEND == "screen": - subprocess.call([BYOBU_BACKEND, "-X", "at", "0", "source", "%s/profile" % BYOBU_CONFIG_DIR]) - except: - True - - -def terminal_size(): - # decide on some terminal size - cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2) - # try open fds - if not cr: - # ...then ctty - try: - fd = os.open(os.ctermid(), os.O_RDONLY) - cr = ioctl_GWINSZ(fd) - os.close(fd) - except: - pass - if not cr: - # env vars or finally defaults - try: - cr = (env['LINES'], env['COLUMNS']) - except: - cr = (25, 80) - # reverse rows, cols - return int(cr[1] - 5), int(cr[0] - 5) - - -def menu(snackScreen, size, isInstalled): - if isInstalled: - installtext = _("Byobu currently launches at login (toggle off)") - else: - installtext = _("Byobu currently does not launch at login (toggle on)") - li = Listbox(height=6, width=60, returnExit=1) - li.append(_("Help -- Quick Start Guide"), 1) - li.append(_("Toggle status notifications"), 2) - li.append(_("Change escape sequence"), 3) - li.append(installtext, 4) - bb = ButtonBar(snackScreen, (("Exit", "exit", ESC),), compact=1) - g = GridForm(snackScreen, _(" Byobu Configuration Menu"), 1, 2) - g.add(li, 0, 0, padding=(4, 2, 4, 2)) - g.add(bb, 0, 1, padding=(1, 1, 0, 0)) - if bb.buttonPressed(g.runOnce()) == "exit": - return 0 - else: - return li.current() - - -def messagebox(snackScreen, width, height, title, text, scroll=0, buttons=((_("Okay"), "okay"), (_("Cancel"), "cancel", ESC))): - t = Textbox(width, height, text, scroll=scroll) - bb = ButtonBar(snackScreen, buttons, compact=1) - g = GridForm(snackScreen, title, 1, 2) - g.add(t, 0, 0, padding=(0, 0, 0, 0)) - g.add(bb, 0, 1, padding=(1, 1, 0, 0)) - return bb.buttonPressed(g.runOnce()) - - -def help(snackScreen, size): - f = open(DOC + '/help.' + BYOBU_BACKEND + '.txt') - text = f.read() - f.close() - text = text.replace("", getesckey(), 1) - t = Textbox(67, 16, text, scroll=1, wrap=1) - bb = ButtonBar(snackScreen, ((_("Menu"), "menu", ESC),), compact=1) - g = GridForm(snackScreen, _("Byobu Help"), 2, 4) - g.add(t, 1, 0) - g.add(bb, 1, 1, padding=(1, 1, 0, 0)) - button = bb.buttonPressed(g.runOnce()) - return 100 - - -def readstatus(): - status = {} - glo = {} - loc = {} - for f in [SHARE + '/status/status', BYOBU_CONFIG_DIR + '/status']: - if os.path.exists(f): - try: - exec(open(f).read(), glo, loc) - except: - error("Invalid configuration [%s]" % f) - if BYOBU_BACKEND == "tmux": - items = "%s %s" % (loc["tmux_left"], loc["tmux_right"]) - else: - items = "%s %s %s %s" % (loc["screen_upper_left"], loc["screen_upper_right"], loc["screen_lower_left"], loc["screen_lower_right"]) - for i in items.split(): - if i.startswith("#"): - i = i.replace("#", "") - status[i] = "0" - else: - status[i] = "1" - li = [] - keys = status.keys() - for i in sorted(keys): - window = [int(status[i]), i] - li.append(window) - return li - - -def genstatusstring(s, status): - new = "" - glo = {} - loc = {} - exec(open(SHARE + '/status/status').read(), glo, loc) - for i in loc[s].split(): - if i.startswith("#"): - i = i.replace("#", "") - if status[i] == 1: - new += " " + i - else: - new += " #" + i - return new - - -def writestatus(items): - status = {} - path = BYOBU_CONFIG_DIR + '/status' - for i in items: - status[i[1]] = i[0] - for key in ["tmux_left", "tmux_right", "screen_upper_left", "screen_upper_right", "screen_lower_left", "screen_lower_right"]: - if key.startswith(BYOBU_BACKEND): - f = open(path, "r") - lines = f.readlines() - f.close() - f = open(path, "w") - for l in lines: - if l.startswith("%s=" % key): - val = genstatusstring(key, status) - f.write("%s=\"%s\"\n" % (key, val)) - else: - f.write(l) - f.close - - -def togglestatus(snackScreen, size): - itemlist = readstatus() - rl = Label("") - r = CheckboxTree(12, scroll=1) - count = 0 - for item in itemlist: - if item[0] != -1: - r.append(item[1], count, selected=item[0]) - count = count + 1 - bb = ButtonBar(snackScreen, ((_("Apply"), "apply"), (_("Cancel"), "cancel", ESC)), compact=1) - g = GridForm(snackScreen, _("Toggle status notifications"), 2, 4) - g.add(rl, 0, 0, anchorLeft=1, anchorTop=1, padding=(4, 0, 0, 1)) - g.add(r, 1, 0) - g.add(bb, 1, 1, padding=(4, 1, 0, 0)) - if bb.buttonPressed(g.runOnce()) != "cancel": - count = 0 - for item in itemlist: - if item[0] != -1: - item[0] = r.getEntryValue(count)[1] - count = count + 1 - writestatus(itemlist) - reload_required() - return 100 - - -def install(snackScreen, size, isInstalled): - out = "" - if isInstalled: - if subprocess.call(["byobu-launcher-uninstall"]) == 0: - out = _("Byobu will not be launched next time you login.") - button = messagebox(snackScreen, 60, 2, _("Message"), out, buttons=((_("Menu"), ))) - return 101 - else: - if subprocess.call(["byobu-launcher-install"]) == 0: - out = _("Byobu will be launched automatically next time you login.") - button = messagebox(snackScreen, 60, 2, "Message", out, buttons=((_("Menu"), ))) - return 100 - - -def appendtofile(p, s): - f = open(p, 'a') - try: - f.write(s) - except IOError: - f.close() - return - f.close() - return - - -def getesckey(): - line = "" - if BYOBU_BACKEND == "tmux": - path = BYOBU_CONFIG_DIR + '/keybindings.tmux' - if os.path.exists(path): - for l in open(path): - if l.startswith("set -g prefix "): - line = l - else: - return DEF_ESC - else: - path = BYOBU_CONFIG_DIR + '/keybindings' - if os.path.exists(path): - for l in open(path): - if l.startswith("escape "): - line = l - else: - return DEF_ESC - if line == "": - return DEF_ESC - esc = line[line.find('^') + 1] - if esc == "`": - esc = " " - return esc - - -def setesckey(key): - if key.isalpha(): - subprocess.call(["byobu-ctrl-a", "screen", key]) - - -def chgesc(snackScreen, size): - esc = Entry(2, text=getesckey(), returnExit=1) - escl = Label(_("Escape key: ctrl-")) - bb = ButtonBar(snackScreen, ((_("Apply"), "apply"), (_("Cancel"), "cancel", ESC)), compact=1) - g = GridForm(snackScreen, _("Change escape sequence"), 2, 4) - g.add(escl, 0, 0, anchorLeft=1, padding=(1, 0, 0, 1)) - g.add(esc, 1, 0, anchorLeft=1) - g.add(bb, 1, 1) - g.setTimer(100) - loop = 1 - while loop: - which = g.run() - if which == "TIMER": - val = esc.value() - if len(val) > 1: - esc.set(val[1]) - # Ensure that escape sequence is not \ or / - if val == '/' or val == '\\': - esc.set(DEF_ESC) - # Ensure that the escape sequence is not set to a number - try: - dummy = int(esc.value()) - esc.set(DEF_ESC) - except: - # do nothing - dummy = "foo" - else: - loop = 0 - snackScreen.popWindow() - button = bb.buttonPressed(which) - if button != "cancel": - setesckey(esc.value()) - reload_required() - if button == "exit": - return 0 - return 100 - - -def autolaunch(): - if os.path.exists(BYOBU_CONFIG_DIR + "/disable-autolaunch"): - return 0 - try: - for line in open("%s/.profile" % HOME): - if "byobu-launch" in line: - return 1 - except: - return 0 - if os.path.exists("/etc/profile.d/Z98-%s.sh" % PKG): - return 1 - return 0 - - -def main(): - """This is the main loop of our utility""" - size = terminal_size() - snackScreen = SnackScreen() - snackScreen.drawRootText(1, 0, _('Byobu Configuration Menu')) - snackScreen.pushHelpLine(_(' between elements | selects | exits')) - isInstalled = autolaunch() - tag = 100 - while tag > 0: - tag = menu(snackScreen, size, isInstalled) - if tag == 1: - tag = help(snackScreen, size) - elif tag == 2: - tag = togglestatus(snackScreen, size) - elif tag == 3: - tag = chgesc(snackScreen, size) - elif tag == 4: - tag = install(snackScreen, size, isInstalled) - isInstalled = autolaunch() - snackScreen.finish() - sys.exit(0) - - -if __name__ == "__main__": - main() diff -Nru byobu-5.73/usr/lib/byobu/include/config.py.in byobu-5.74/usr/lib/byobu/include/config.py.in --- byobu-5.73/usr/lib/byobu/include/config.py.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/lib/byobu/include/config.py.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,391 @@ +#!/usr/bin/python +# +# config.py +# Copyright (C) 2008 Canonical Ltd. +# Copyright (C) 2008-2013 Dustin Kirkland + +# +# Authors: Nick Barcet +# Dustin Kirkland +# +# 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 . + +# If you change any strings, please generate localization information with: +# ./debian/rules get-po + +import sys +import os +import os.path +import time +import string +import subprocess +import gettext +import glob + + +def error(msg): + print("ERROR: %s" % msg) + sys.exit(1) + + +try: + import snack + from snack import * +except: + error("Could not import the python snack module") + + +PKG = "byobu" +HOME = os.getenv("HOME") +USER = os.getenv("USER") +BYOBU_CONFIG_DIR = os.getenv("BYOBU_CONFIG_DIR", HOME + "/.byobu") +BYOBU_RUN_DIR = os.getenv("BYOBU_RUN_DIR", HOME + "/.cache/byobu") +BYOBU_BACKEND = os.getenv("BYOBU_BACKEND", "tmux") +BYOBU_SOCKETDIR = os.getenv("SOCKETDIR", "/var/run/screen") +BYOBU_PREFIX = os.getenv("BYOBU_PREFIX", "@prefix@") +SHARE = BYOBU_PREFIX + '/share/' + PKG +DOC = BYOBU_PREFIX + '/share/doc/' + PKG +if not os.path.exists(SHARE): + SHARE = BYOBU_CONFIG_DIR + "/" + SHARE +if not os.path.exists(DOC): + DOC = BYOBU_CONFIG_DIR + "/" + DOC +DEF_ESC = "A" +RELOAD = "If you are using the default set of keybindings, press\n or to activate these changes.\n\nOtherwise, exit this session and start a new one." +RELOAD_FLAG = "%s/reload-required" % (BYOBU_RUN_DIR) +ESC = '' +snack.hotkeys[ESC] = ord(ESC) +snack.hotkeys[ord(ESC)] = ESC +gettext.bindtextdomain(PKG, SHARE + '/po') +gettext.textdomain(PKG) +_ = gettext.gettext + + +def ioctl_GWINSZ(fd): + # Discover terminal width + try: + import fcntl + import termios + import struct + import os + cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234')) + except: + return None + return cr + + +def reload_required(): + try: + if not os.path.exists(BYOBU_CONFIG_DIR): + # 493 (decimal) is 0755 (octal) + # Use decimal for portability across all python versions + os.makedirs(BYOBU_CONFIG_DIR, 493) + f = open(RELOAD_FLAG, 'w') + f.close() + if BYOBU_BACKEND == "screen": + subprocess.call([BYOBU_BACKEND, "-X", "at", "0", "source", "%s/profile" % BYOBU_CONFIG_DIR]) + except: + True + + +def terminal_size(): + # decide on some terminal size + cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2) + # try open fds + if not cr: + # ...then ctty + try: + fd = os.open(os.ctermid(), os.O_RDONLY) + cr = ioctl_GWINSZ(fd) + os.close(fd) + except: + pass + if not cr: + # env vars or finally defaults + try: + cr = (env['LINES'], env['COLUMNS']) + except: + cr = (25, 80) + # reverse rows, cols + return int(cr[1] - 5), int(cr[0] - 5) + + +def menu(snackScreen, size, isInstalled): + if isInstalled: + installtext = _("Byobu currently launches at login (toggle off)") + else: + installtext = _("Byobu currently does not launch at login (toggle on)") + li = Listbox(height=6, width=60, returnExit=1) + li.append(_("Help -- Quick Start Guide"), 1) + li.append(_("Toggle status notifications"), 2) + li.append(_("Change escape sequence"), 3) + li.append(installtext, 4) + bb = ButtonBar(snackScreen, (("Exit", "exit", ESC),), compact=1) + g = GridForm(snackScreen, _(" Byobu Configuration Menu"), 1, 2) + g.add(li, 0, 0, padding=(4, 2, 4, 2)) + g.add(bb, 0, 1, padding=(1, 1, 0, 0)) + if bb.buttonPressed(g.runOnce()) == "exit": + return 0 + else: + return li.current() + + +def messagebox(snackScreen, width, height, title, text, scroll=0, buttons=((_("Okay"), "okay"), (_("Cancel"), "cancel", ESC))): + t = Textbox(width, height, text, scroll=scroll) + bb = ButtonBar(snackScreen, buttons, compact=1) + g = GridForm(snackScreen, title, 1, 2) + g.add(t, 0, 0, padding=(0, 0, 0, 0)) + g.add(bb, 0, 1, padding=(1, 1, 0, 0)) + return bb.buttonPressed(g.runOnce()) + + +def help(snackScreen, size): + f = open(DOC + '/help.' + BYOBU_BACKEND + '.txt') + text = f.read() + f.close() + text = text.replace("", getesckey(), 1) + t = Textbox(67, 16, text, scroll=1, wrap=1) + bb = ButtonBar(snackScreen, ((_("Menu"), "menu", ESC),), compact=1) + g = GridForm(snackScreen, _("Byobu Help"), 2, 4) + g.add(t, 1, 0) + g.add(bb, 1, 1, padding=(1, 1, 0, 0)) + button = bb.buttonPressed(g.runOnce()) + return 100 + + +def readstatus(): + status = {} + glo = {} + loc = {} + for f in [SHARE + '/status/status', BYOBU_CONFIG_DIR + '/status']: + if os.path.exists(f): + try: + exec(open(f).read(), glo, loc) + except: + error("Invalid configuration [%s]" % f) + if BYOBU_BACKEND == "tmux": + items = "%s %s" % (loc["tmux_left"], loc["tmux_right"]) + else: + items = "%s %s %s %s" % (loc["screen_upper_left"], loc["screen_upper_right"], loc["screen_lower_left"], loc["screen_lower_right"]) + for i in items.split(): + if i.startswith("#"): + i = i.replace("#", "") + status[i] = "0" + else: + status[i] = "1" + li = [] + keys = status.keys() + for i in sorted(keys): + window = [int(status[i]), i] + li.append(window) + return li + + +def genstatusstring(s, status): + new = "" + glo = {} + loc = {} + exec(open(SHARE + '/status/status').read(), glo, loc) + for i in loc[s].split(): + if i.startswith("#"): + i = i.replace("#", "") + if status[i] == 1: + new += " " + i + else: + new += " #" + i + return new + + +def writestatus(items): + status = {} + path = BYOBU_CONFIG_DIR + '/status' + for i in items: + status[i[1]] = i[0] + for key in ["tmux_left", "tmux_right", "screen_upper_left", "screen_upper_right", "screen_lower_left", "screen_lower_right"]: + if key.startswith(BYOBU_BACKEND): + try: + f = open(path, "r") + except: + f = open(SHARE + '/status/status', "r") + lines = f.readlines() + f.close() + try: + f = open(path, "w") + except: + f = open(path, "a+") + for l in lines: + if l.startswith("%s=" % key): + val = genstatusstring(key, status) + f.write("%s=\"%s\"\n" % (key, val)) + else: + f.write(l) + f.close + + +def togglestatus(snackScreen, size): + itemlist = readstatus() + rl = Label("") + r = CheckboxTree(12, scroll=1) + count = 0 + for item in itemlist: + if item[0] != -1: + r.append(item[1], count, selected=item[0]) + count = count + 1 + bb = ButtonBar(snackScreen, ((_("Apply"), "apply"), (_("Cancel"), "cancel", ESC)), compact=1) + g = GridForm(snackScreen, _("Toggle status notifications"), 2, 4) + g.add(rl, 0, 0, anchorLeft=1, anchorTop=1, padding=(4, 0, 0, 1)) + g.add(r, 1, 0) + g.add(bb, 1, 1, padding=(4, 1, 0, 0)) + if bb.buttonPressed(g.runOnce()) != "cancel": + count = 0 + for item in itemlist: + if item[0] != -1: + item[0] = r.getEntryValue(count)[1] + count = count + 1 + writestatus(itemlist) + reload_required() + return 100 + + +def install(snackScreen, size, isInstalled): + out = "" + if isInstalled: + if subprocess.call(["byobu-launcher-uninstall"]) == 0: + out = _("Byobu will not be launched next time you login.") + button = messagebox(snackScreen, 60, 2, _("Message"), out, buttons=((_("Menu"), ))) + return 101 + else: + if subprocess.call(["byobu-launcher-install"]) == 0: + out = _("Byobu will be launched automatically next time you login.") + button = messagebox(snackScreen, 60, 2, "Message", out, buttons=((_("Menu"), ))) + return 100 + + +def appendtofile(p, s): + f = open(p, 'a') + try: + f.write(s) + except IOError: + f.close() + return + f.close() + return + + +def getesckey(): + line = "" + if BYOBU_BACKEND == "tmux": + path = BYOBU_CONFIG_DIR + '/keybindings.tmux' + if os.path.exists(path): + for l in open(path): + if l.startswith("set -g prefix "): + line = l + else: + return DEF_ESC + else: + path = BYOBU_CONFIG_DIR + '/keybindings' + if os.path.exists(path): + for l in open(path): + if l.startswith("escape "): + line = l + else: + return DEF_ESC + if line == "": + return DEF_ESC + esc = line[line.find('^') + 1] + if esc == "`": + esc = " " + return esc + + +def setesckey(key): + if key.isalpha(): + subprocess.call(["byobu-ctrl-a", "screen", key]) + + +def chgesc(snackScreen, size): + esc = Entry(2, text=getesckey(), returnExit=1) + escl = Label(_("Escape key: ctrl-")) + bb = ButtonBar(snackScreen, ((_("Apply"), "apply"), (_("Cancel"), "cancel", ESC)), compact=1) + g = GridForm(snackScreen, _("Change escape sequence"), 2, 4) + g.add(escl, 0, 0, anchorLeft=1, padding=(1, 0, 0, 1)) + g.add(esc, 1, 0, anchorLeft=1) + g.add(bb, 1, 1) + g.setTimer(100) + loop = 1 + while loop: + which = g.run() + if which == "TIMER": + val = esc.value() + if len(val) > 1: + esc.set(val[1]) + # Ensure that escape sequence is not \ or / + if val == '/' or val == '\\': + esc.set(DEF_ESC) + # Ensure that the escape sequence is not set to a number + try: + dummy = int(esc.value()) + esc.set(DEF_ESC) + except: + # do nothing + dummy = "foo" + else: + loop = 0 + snackScreen.popWindow() + button = bb.buttonPressed(which) + if button != "cancel": + setesckey(esc.value()) + reload_required() + if button == "exit": + return 0 + return 100 + + +def autolaunch(): + if os.path.exists(BYOBU_CONFIG_DIR + "/disable-autolaunch"): + return 0 + try: + for line in open("%s/.profile" % HOME): + if "byobu-launch" in line: + return 1 + except: + return 0 + if os.path.exists("/etc/profile.d/Z98-%s.sh" % PKG): + return 1 + return 0 + + +def main(): + """This is the main loop of our utility""" + size = terminal_size() + snackScreen = SnackScreen() + snackScreen.drawRootText(1, 0, _('Byobu Configuration Menu')) + snackScreen.pushHelpLine(_(' between elements | selects | exits')) + isInstalled = autolaunch() + tag = 100 + while tag > 0: + tag = menu(snackScreen, size, isInstalled) + if tag == 1: + tag = help(snackScreen, size) + elif tag == 2: + tag = togglestatus(snackScreen, size) + elif tag == 3: + tag = chgesc(snackScreen, size) + elif tag == 4: + tag = install(snackScreen, size, isInstalled) + isInstalled = autolaunch() + snackScreen.finish() + sys.exit(0) + + +if __name__ == "__main__": + main() diff -Nru byobu-5.73/usr/lib/byobu/include/dirs byobu-5.74/usr/lib/byobu/include/dirs --- byobu-5.73/usr/lib/byobu/include/dirs 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/lib/byobu/include/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -#!/bin/sh -# -# dirs: some dirs needed by all library status scripts -# -# Copyright (C) 2011 Dustin Kirkland -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" - -# Some users build and install byobu themselves, rather than from a distro -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="/usr" - -# Create and export the user configuration directory -if [ -d "$BYOBU_CONFIG_DIR" ]; then - export BYOBU_CONFIG_DIR="$BYOBU_CONFIG_DIR" -elif [ -d "$XDG_CONFIG_HOME" ]; then - # Use XDG, as some users insist on such nonsense :-) - export BYOBU_CONFIG_DIR="$XDG_CONFIG_HOME/$PKG" -elif [ -d "$HOME/.config/$PKG" ]; then - # Use XDG config directory, if it exists - export BYOBU_CONFIG_DIR="$HOME/.config/$PKG" -elif [ -d "$HOME/.local/share/$PKG" ]; then - # Use XDG local directory, if it exists - export BYOBU_CONFIG_DIR="$HOME/.local/share/$PKG" -else - # And to default to good old classic config dir location! - export BYOBU_CONFIG_DIR="$HOME/.$PKG" -fi -[ -d "$BYOBU_CONFIG_DIR" ] || mkdir -p "$BYOBU_CONFIG_DIR" - -# Grab the global, then local socket directory -[ -r "/etc/$PKG/socketdir" ] && . "/etc/$PKG/socketdir" -[ -r "$BYOBU_CONFIG_DIR/socketdir" ] && . "$BYOBU_CONFIG_DIR/socketdir" - -# Create and export the runtime cache directory -if [ -w /dev/shm ]; then - # Use shm for performance, if possible - for i in /dev/shm/$PKG-$USER-*; do - if [ -d "$i" ] && [ -O "$i" ]; then - export BYOBU_RUN_DIR="$i" - break - fi - done - # Still empty, make a new one - if [ ! -d "$BYOBU_RUN_DIR" ] || [ ! -O "$BYOBU_RUN_DIR" ]; then - export BYOBU_RUN_DIR=$(mktemp -d /dev/shm/$PKG-$USER-XXXXXXXX) - fi -else - # For distros that don't have a /dev/shm, use local disk - if [ -d "$XDG_CACHE_HOME" ]; then - # Use XDG, as some users insist on such nonsense :-) - export BYOBU_RUN_DIR="$XDG_CACHE_HOME/$PKG" - else - # But if not, we'll use a cache directory - export BYOBU_RUN_DIR="$HOME/.cache/$PKG" - fi -fi diff -Nru byobu-5.73/usr/lib/byobu/include/dirs.in byobu-5.74/usr/lib/byobu/include/dirs.in --- byobu-5.73/usr/lib/byobu/include/dirs.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/lib/byobu/include/dirs.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,71 @@ +#!/bin/sh +# +# dirs: some dirs needed by all library status scripts +# +# Copyright (C) 2011 Dustin Kirkland +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" + +# Some users build and install byobu themselves, rather than from a distro +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="@prefix@" + +# Create and export the user configuration directory +if [ -d "$BYOBU_CONFIG_DIR" ]; then + export BYOBU_CONFIG_DIR="$BYOBU_CONFIG_DIR" +elif [ -d "$XDG_CONFIG_HOME" ]; then + # Use XDG, as some users insist on such nonsense :-) + export BYOBU_CONFIG_DIR="$XDG_CONFIG_HOME/$PKG" +elif [ -d "$HOME/.config/$PKG" ]; then + # Use XDG config directory, if it exists + export BYOBU_CONFIG_DIR="$HOME/.config/$PKG" +elif [ -d "$HOME/.local/share/$PKG" ]; then + # Use XDG local directory, if it exists + export BYOBU_CONFIG_DIR="$HOME/.local/share/$PKG" +else + # And to default to good old classic config dir location! + export BYOBU_CONFIG_DIR="$HOME/.$PKG" +fi +[ -d "$BYOBU_CONFIG_DIR" ] || mkdir -p "$BYOBU_CONFIG_DIR" + +# Grab the global, then local socket directory +[ -r "/etc/$PKG/socketdir" ] && . "/etc/$PKG/socketdir" +[ -r "$BYOBU_CONFIG_DIR/socketdir" ] && . "$BYOBU_CONFIG_DIR/socketdir" + +# Create and export the runtime cache directory +if [ -w /dev/shm ]; then + # Use shm for performance, if possible + for i in /dev/shm/$PKG-$USER-*; do + if [ -d "$i" ] && [ -O "$i" ]; then + export BYOBU_RUN_DIR="$i" + break + fi + done + # Still empty, make a new one + if [ ! -d "$BYOBU_RUN_DIR" ] || [ ! -O "$BYOBU_RUN_DIR" ]; then + export BYOBU_RUN_DIR=$(mktemp -d /dev/shm/$PKG-$USER-XXXXXXXX) + fi +else + # For distros that don't have a /dev/shm, use local disk + if [ -d "$XDG_CACHE_HOME" ]; then + # Use XDG, as some users insist on such nonsense :-) + export BYOBU_RUN_DIR="$XDG_CACHE_HOME/$PKG" + else + # But if not, we'll use a cache directory + export BYOBU_RUN_DIR="$HOME/.cache/$PKG" + fi +fi diff -Nru byobu-5.73/usr/lib/byobu/include/ec2instancespricing.py byobu-5.74/usr/lib/byobu/include/ec2instancespricing.py --- byobu-5.73/usr/lib/byobu/include/ec2instancespricing.py 2013-11-01 20:00:51.000000000 +0000 +++ byobu-5.74/usr/lib/byobu/include/ec2instancespricing.py 2014-02-28 18:01:37.000000000 +0000 @@ -1,7 +1,6 @@ #!/usr/bin/python # # Copyright (c) 2012 Eran Sandler (eran@sandler.co.il), http://eran.sandler.co.il, http://forecastcloudy.net -# Copyright (C) 2012-2013 Dustin Kirkland # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -24,403 +23,556 @@ # import urllib2 import argparse +import datetime try: - import simplejson as json + import simplejson as json except ImportError: - import json + 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" + "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" + "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", - "mswin" + "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" + "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" + "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_URL = "http://aws.amazon.com/ec2/pricing/pricing-on-demand-instances.json" -INSTANCES_RESERVED_LIGHT_UTILIZATION_LINUX_URL = "http://aws.amazon.com/ec2/pricing/ri-light-linux.json" -INSTANCES_RESERVED_LIGHT_UTILIZATION_WINDOWS_URL = "http://aws.amazon.com/ec2/pricing/ri-light-mswin.json" -INSTNACES_RESERVED_MEDIUM_UTILIZATION_LINUX_URL = "http://aws.amazon.com/ec2/pricing/ri-medium-linux.json" -INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINDOWS_URL = "http://aws.amazon.com/ec2/pricing/ri-medium-mswin.json" -INSTANCES_RESERVED_HEAVY_UTILIZATION_LINUX_URL = "http://aws.amazon.com/ec2/pricing/ri-heavy-linux.json" -INSTANCES_RESERVED_HEAVY_UTILIZATION_WINDOWS_URL = "http://aws.amazon.com/ec2/pricing/ri-heavy-mswin.json" +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_WINDOWS_URL : "mswin", - INSTNACES_RESERVED_MEDIUM_UTILIZATION_LINUX_URL : "linux", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINDOWS_URL : "mswin", - INSTANCES_RESERVED_HEAVY_UTILIZATION_LINUX_URL : "linux", - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINDOWS_URL : "mswin" + 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_WINDOWS_URL : "light", - INSTNACES_RESERVED_MEDIUM_UTILIZATION_LINUX_URL : "medium", - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINDOWS_URL : "medium", - INSTANCES_RESERVED_HEAVY_UTILIZATION_LINUX_URL : "heavy", - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINDOWS_URL : "heavy" + 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" + "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" + "u" : "micro", + "sm" : "small", + "med" : "medium", + "lg" : "large", + "xl" : "xlarge", + "xxl" : "2xlarge", + "xxxxl" : "4xlarge", + "xxxxxxxxl" : "8xlarge" } -def _load_data(url): - f = urllib2.urlopen(url) - return json.loads(f.read()) - -def get_ec2_reserved_instances_prices(filter_region=None, filter_instance_type=None, filter_os_type=None): - """ 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_WINDOWS_URL, - INSTNACES_RESERVED_MEDIUM_UTILIZATION_LINUX_URL, - INSTANCES_RESERVED_MEDIUM_UTILIZATION_WINDOWS_URL, - INSTANCES_RESERVED_HEAVY_UTILIZATION_LINUX_URL, - INSTANCES_RESERVED_HEAVY_UTILIZATION_WINDOWS_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] - utilization_type = INSTANCES_RESERVED_UTILIZATION_TYPE_BY_URL[u] - data = _load_data(u) - 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 = INSTANCE_TYPE_MAPPING[it["type"]] - if "sizes" in it: - for s in it["sizes"]: - instance_size = INSTANCE_SIZE_MAPPING[s["size"]] - - prices = { - "1year" : { - "hourly" : None, - "upfront" : None - }, - "3year" : { - "hourly" : None, - "upfront" : None - } - } - - _type = "%s.%s" % (instance_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): - """ 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 - - result_regions = [] - result = { - "config" : { - "currency" : currency, - "unit" : "perhr" - }, - "regions" : result_regions - } - - data = _load_data(INSTANCES_ON_DEMAND_URL) - 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 = INSTANCE_TYPE_MAPPING[it["type"]] - if "sizes" in it: - for s in it["sizes"]: - instance_size = INSTANCE_SIZE_MAPPING[s["size"]] - - for price_data in s["valueColumns"]: - price = None - try: - price = float(price_data["prices"][currency]) - except ValueError: - price = None - - _type = "%s.%s" % (instance_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 - }) +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 = urllib2.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 + return result - return None 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"])) + 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 -Nru byobu-5.73/usr/lib/byobu/include/Makefile.in byobu-5.74/usr/lib/byobu/include/Makefile.in --- byobu-5.73/usr/lib/byobu/include/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/lib/byobu/include/Makefile.in 2014-03-16 19:45:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -77,13 +77,15 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = usr/lib/byobu/include -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/config.py.in $(srcdir)/dirs.in \ + $(srcdir)/toggle-utf8.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = config.py dirs toggle-utf8 CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -244,6 +246,12 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +config.py: $(top_builddir)/config.status $(srcdir)/config.py.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +dirs: $(top_builddir)/config.status $(srcdir)/dirs.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +toggle-utf8: $(top_builddir)/config.status $(srcdir)/toggle-utf8.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-inclibdirSCRIPTS: $(inclibdir_SCRIPTS) @$(NORMAL_INSTALL) @list='$(inclibdir_SCRIPTS)'; test -n "$(inclibdirdir)" || list=; \ diff -Nru byobu-5.73/usr/lib/byobu/include/toggle-utf8 byobu-5.74/usr/lib/byobu/include/toggle-utf8 --- byobu-5.73/usr/lib/byobu/include/toggle-utf8 2013-09-19 16:34:11.000000000 +0000 +++ byobu-5.74/usr/lib/byobu/include/toggle-utf8 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -#!/bin/sh -e -# -# toggle-utf8 -# Copyright (C) 2013 Dustin Kirkland -# -# Authors: Dustin Kirkland -# -# 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 . - -PKG="byobu" -[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" -[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX -. "${BYOBU_PREFIX}/lib/${PKG}/include/common" -[ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc" - -if [ "$BYOBU_CHARMAP" = "UTF-8" ]; then - if grep -qs "^BYOBU_CHARMAP=" $BYOBU_CONFIG_DIR/statusrc 2>/dev/null; then - sed -i -e "s/^BYOBU_CHARMAP=.*/BYOBU_CHARMAP=x/" $BYOBU_CONFIG_DIR/statusrc - else - echo "BYOBU_CHARMAP=x" >> $BYOBU_CONFIG_DIR/statusrc - fi - export BYOBU_CHARMAP=x -else - if grep -qs "^BYOBU_CHARMAP=" $BYOBU_CONFIG_DIR/statusrc 2>/dev/null; then - sed -i -e "s/^BYOBU_CHARMAP=.*/BYOBU_CHARMAP=UTF-8/" $BYOBU_CONFIG_DIR/statusrc - else - echo "BYOBU_CHARMAP=UTF-8" >> $BYOBU_CONFIG_DIR/statusrc - fi - export BYOBU_CHARMAP=UTF-8 -fi -if [ -n "$TMUX" ]; then - tmux send-keys " export BYOBU_CHARMAP=$BYOBU_CHARMAP ; . ~/.bashrc" \; send-keys Enter -fi - -# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/lib/byobu/include/toggle-utf8.in byobu-5.74/usr/lib/byobu/include/toggle-utf8.in --- byobu-5.73/usr/lib/byobu/include/toggle-utf8.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/lib/byobu/include/toggle-utf8.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,45 @@ +#!/bin/sh -e +# +# toggle-utf8 +# Copyright (C) 2013 Dustin Kirkland +# +# Authors: Dustin Kirkland +# +# 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 . + +PKG="byobu" +[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" +[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX +. "${BYOBU_PREFIX}/lib/${PKG}/include/common" +[ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc" + +if [ "$BYOBU_CHARMAP" = "UTF-8" ]; then + if grep -qs "^BYOBU_CHARMAP=" $BYOBU_CONFIG_DIR/statusrc 2>/dev/null; then + sed -i -e "s/^BYOBU_CHARMAP=.*/BYOBU_CHARMAP=x/" $BYOBU_CONFIG_DIR/statusrc + else + echo "BYOBU_CHARMAP=x" >> $BYOBU_CONFIG_DIR/statusrc + fi + export BYOBU_CHARMAP=x +else + if grep -qs "^BYOBU_CHARMAP=" $BYOBU_CONFIG_DIR/statusrc 2>/dev/null; then + sed -i -e "s/^BYOBU_CHARMAP=.*/BYOBU_CHARMAP=UTF-8/" $BYOBU_CONFIG_DIR/statusrc + else + echo "BYOBU_CHARMAP=UTF-8" >> $BYOBU_CONFIG_DIR/statusrc + fi + export BYOBU_CHARMAP=UTF-8 +fi +if [ -n "$TMUX" ]; then + tmux send-keys " export BYOBU_CHARMAP=$BYOBU_CHARMAP ; . ~/.bashrc" \; send-keys Enter +fi + +# vi: syntax=sh ts=4 noexpandtab diff -Nru byobu-5.73/usr/lib/byobu/logo byobu-5.74/usr/lib/byobu/logo --- byobu-5.73/usr/lib/byobu/logo 2013-09-26 18:20:38.000000000 +0000 +++ byobu-5.74/usr/lib/byobu/logo 2014-02-28 23:55:45.000000000 +0000 @@ -99,7 +99,7 @@ logo=" lm " $MARKUP && printf "$(color g w)$logo$(color -)$(color g w)$(color -) " || printf "$logo" ;; - *red*hat*) + *red*hat*|*rhel*) logo=" RH " $MARKUP && printf "$(color R k)%s$(color -)" "$logo" || printf "$logo" ;; diff -Nru byobu-5.73/usr/lib/byobu/Makefile.in byobu-5.74/usr/lib/byobu/Makefile.in --- byobu-5.73/usr/lib/byobu/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/lib/byobu/Makefile.in 2014-03-16 19:45:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru byobu-5.73/usr/share/applications/Makefile.in byobu-5.74/usr/share/applications/Makefile.in --- byobu-5.73/usr/share/applications/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/share/applications/Makefile.in 2014-03-16 19:45:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru byobu-5.73/usr/share/byobu/keybindings/Makefile.in byobu-5.74/usr/share/byobu/keybindings/Makefile.in --- byobu-5.73/usr/share/byobu/keybindings/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/share/byobu/keybindings/Makefile.in 2014-03-16 19:45:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru byobu-5.73/usr/share/byobu/pixmaps/Makefile.in byobu-5.74/usr/share/byobu/pixmaps/Makefile.in --- byobu-5.73/usr/share/byobu/pixmaps/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/share/byobu/pixmaps/Makefile.in 2014-03-16 19:45:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru byobu-5.73/usr/share/byobu/profiles/bashrc byobu-5.74/usr/share/byobu/profiles/bashrc --- byobu-5.73/usr/share/byobu/profiles/bashrc 2013-11-08 16:16:13.000000000 +0000 +++ byobu-5.74/usr/share/byobu/profiles/bashrc 2014-02-28 22:34:58.000000000 +0000 @@ -24,7 +24,7 @@ esac if [ -n "$TMUX" ] || [ "${TERMCAP#*screen}" != "${TERMCAP}" ]; then # Ensure that we're in bash, in a byobu environment - if [ -n "$BYOBU_BACKEND" ] && [ "$SHELL" = "/bin/bash" ]; then + if [ -n "$BYOBU_BACKEND" ] && [ -n "$BASH" ]; then byobu_prompt_status() { local e=$?; [ $e != 0 ] && echo -e "$e "; } case "$BYOBU_DISTRO" in "Ubuntu") diff -Nru byobu-5.73/usr/share/byobu/profiles/Makefile.in byobu-5.74/usr/share/byobu/profiles/Makefile.in --- byobu-5.73/usr/share/byobu/profiles/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/share/byobu/profiles/Makefile.in 2014-03-16 19:45:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru byobu-5.73/usr/share/byobu/profiles/tmux byobu-5.74/usr/share/byobu/profiles/tmux --- byobu-5.73/usr/share/byobu/profiles/tmux 2014-02-09 13:11:41.000000000 +0000 +++ byobu-5.74/usr/share/byobu/profiles/tmux 2014-03-16 19:37:10.000000000 +0000 @@ -35,9 +35,10 @@ # Byobu's Keybindings source $BYOBU_PREFIX/share/byobu/keybindings/f-keys.tmux +set-window-option -g xterm-keys on -set-option -g set-titles on -set-option -g set-titles-string '#(whoami)@#H - byobu (#S)' +#set-option -g set-titles on +#set-option -g set-titles-string '#(whoami)@#H - byobu (#S)' set-option -g pane-active-border-bg $BYOBU_ACCENT set-option -g pane-active-border-fg $BYOBU_ACCENT set-option -g pane-border-fg $BYOBU_LIGHT @@ -88,6 +89,3 @@ set -g status-right '#(byobu-status tmux_right)'$BYOBU_DATE$BYOBU_TIME set -g message-bg $BYOBU_ACCENT set -g message-fg white - -# Allow local overrides -source $BYOBU_CONFIG_DIR/.tmux.conf diff -Nru byobu-5.73/usr/share/byobu/status/Makefile.in byobu-5.74/usr/share/byobu/status/Makefile.in --- byobu-5.73/usr/share/byobu/status/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/share/byobu/status/Makefile.in 2014-03-16 19:45:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru byobu-5.73/usr/share/byobu/tests/byobu-time-notifications byobu-5.74/usr/share/byobu/tests/byobu-time-notifications --- byobu-5.73/usr/share/byobu/tests/byobu-time-notifications 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/share/byobu/tests/byobu-time-notifications 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -#!/bin/bash -# -# byobu-time-notifications: performance testing of byobu's status scripts -# -# Copyright (C) 2009 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# 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 . - - -PKG=byobu -RUNS=100 -[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr" -export BYOBU_PREFIX - -loop() { - for j in $(seq 1 $RUNS); do - usr/lib/$PKG/$1 >/dev/null 2>&1 - done -} - -TIMEFORMAT="%R" -if [ -n "$1" ]; then - list="$1" -else - list=$(ls /usr/lib/$PKG/) -fi -for i in $list; do - case "$i" in - notify_osd) - continue - ;; - esac - freq=`grep "byobu-status $i$" /usr/share/$PKG/profiles/common | awk '{print $3}'` - printf "%s" "$i $freq " - time loop $i -done diff -Nru byobu-5.73/usr/share/byobu/tests/byobu-time-notifications.in byobu-5.74/usr/share/byobu/tests/byobu-time-notifications.in --- byobu-5.73/usr/share/byobu/tests/byobu-time-notifications.in 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.74/usr/share/byobu/tests/byobu-time-notifications.in 2014-02-28 23:22:27.000000000 +0000 @@ -0,0 +1,48 @@ +#!/bin/bash +# +# byobu-time-notifications: performance testing of byobu's status scripts +# +# Copyright (C) 2009 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# 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 . + + +PKG=byobu +RUNS=100 +[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="@prefix@" +export BYOBU_PREFIX + +loop() { + for j in $(seq 1 $RUNS); do + usr/lib/$PKG/$1 >/dev/null 2>&1 + done +} + +TIMEFORMAT="%R" +if [ -n "$1" ]; then + list="$1" +else + list=$(ls /usr/lib/$PKG/) +fi +for i in $list; do + case "$i" in + notify_osd) + continue + ;; + esac + freq=`grep "byobu-status $i$" /usr/share/$PKG/profiles/common | awk '{print $3}'` + printf "%s" "$i $freq " + time loop $i +done diff -Nru byobu-5.73/usr/share/byobu/tests/Makefile.in byobu-5.74/usr/share/byobu/tests/Makefile.in --- byobu-5.73/usr/share/byobu/tests/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/share/byobu/tests/Makefile.in 2014-03-16 19:45:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -77,13 +77,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = usr/share/byobu/tests -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/byobu-time-notifications.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = byobu-time-notifications CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -244,6 +245,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +byobu-time-notifications: $(top_builddir)/config.status $(srcdir)/byobu-time-notifications.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-testsSCRIPTS: $(tests_SCRIPTS) @$(NORMAL_INSTALL) @list='$(tests_SCRIPTS)'; test -n "$(testsdir)" || list=; \ diff -Nru byobu-5.73/usr/share/byobu/windows/Makefile.in byobu-5.74/usr/share/byobu/windows/Makefile.in --- byobu-5.73/usr/share/byobu/windows/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/share/byobu/windows/Makefile.in 2014-03-16 19:45:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru byobu-5.73/usr/share/doc/byobu/Makefile.in byobu-5.74/usr/share/doc/byobu/Makefile.in --- byobu-5.73/usr/share/doc/byobu/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/share/doc/byobu/Makefile.in 2014-03-16 19:45:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru byobu-5.73/usr/share/man/man1/byobu-layout.1 byobu-5.74/usr/share/man/man1/byobu-layout.1 --- byobu-5.73/usr/share/man/man1/byobu-layout.1 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.74/usr/share/man/man1/byobu-layout.1 2014-03-06 15:25:50.000000000 +0000 @@ -1,6 +1,6 @@ .TH byobu-layout 1 "8 Jan 2012" byobu "byobu" .SH NAME -byobu\-layout \- Save and restore byobu-tmux laouts +byobu\-layout \- Save and restore byobu-tmux layouts .SH USAGE byobu\-layout [save|restore] [name] diff -Nru byobu-5.73/usr/share/man/man1/Makefile.in byobu-5.74/usr/share/man/man1/Makefile.in --- byobu-5.73/usr/share/man/man1/Makefile.in 2014-02-17 21:05:06.000000000 +0000 +++ byobu-5.74/usr/share/man/man1/Makefile.in 2014-03-16 19:45:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc.