mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-22 14:24:39 -07:00
* usr/bin/byobu, usr/bin/byobu-ctrl-a, usr/bin/byobu-reconnect-
sockets, usr/lib/byobu/color, usr/lib/byobu/date, usr/lib/byobu/include/shutil, usr/lib/byobu/time: - make check for BYOBU_BACKEND explitly tmux|screen
This commit is contained in:
parent
f13586dc51
commit
4997992873
8 changed files with 13 additions and 6 deletions
4
debian/changelog
vendored
4
debian/changelog
vendored
|
@ -27,6 +27,10 @@ byobu (5.6) unreleased; urgency=low
|
||||||
- use BYOBU_READLINK instead of READLINK
|
- use BYOBU_READLINK instead of READLINK
|
||||||
* usr/bin/byobu-select-session: LP: #911500
|
* usr/bin/byobu-select-session: LP: #911500
|
||||||
- detect and avoid some circular byobu-inside-byobu infinite loops
|
- detect and avoid some circular byobu-inside-byobu infinite loops
|
||||||
|
* usr/bin/byobu, usr/bin/byobu-ctrl-a, usr/bin/byobu-reconnect-
|
||||||
|
sockets, usr/lib/byobu/color, usr/lib/byobu/date,
|
||||||
|
usr/lib/byobu/include/shutil, usr/lib/byobu/time:
|
||||||
|
- make check for BYOBU_BACKEND explitly tmux|screen
|
||||||
|
|
||||||
[ Ryan Thompson ]
|
[ Ryan Thompson ]
|
||||||
* usr/bin/byobu-select-session: LP: #919391
|
* usr/bin/byobu-select-session: LP: #919391
|
||||||
|
|
|
@ -98,7 +98,7 @@ case $BYOBU_BACKEND in
|
||||||
PROFILE="-f $BYOBU_PREFIX/share/$PKG/profiles/tmuxrc"
|
PROFILE="-f $BYOBU_PREFIX/share/$PKG/profiles/tmuxrc"
|
||||||
sessions=$($BYOBU_BACKEND list-sessions 2>/dev/null) || true
|
sessions=$($BYOBU_BACKEND list-sessions 2>/dev/null) || true
|
||||||
;;
|
;;
|
||||||
*)
|
screen)
|
||||||
# Allow override of default window list, with BYOBU_WINDOWS environment variable
|
# Allow override of default window list, with BYOBU_WINDOWS environment variable
|
||||||
CUSTOM_WINDOW_SET=0
|
CUSTOM_WINDOW_SET=0
|
||||||
if [ -s "$BYOBU_WINDOWS" ]; then
|
if [ -s "$BYOBU_WINDOWS" ]; then
|
||||||
|
|
|
@ -90,6 +90,9 @@ case "$bind_to" in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case "$BYOBU_BACKEND" in
|
case "$BYOBU_BACKEND" in
|
||||||
|
tmux)
|
||||||
|
true
|
||||||
|
;;
|
||||||
screen)
|
screen)
|
||||||
$BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile"
|
$BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile"
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -49,7 +49,7 @@ export_and_send () {
|
||||||
tmux)
|
tmux)
|
||||||
tmux setenv "$var" "$value"
|
tmux setenv "$var" "$value"
|
||||||
;;
|
;;
|
||||||
*)
|
screen)
|
||||||
screen -X setenv "$var" "$value"
|
screen -X setenv "$var" "$value"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -29,7 +29,7 @@ __color() {
|
||||||
tmux)
|
tmux)
|
||||||
true
|
true
|
||||||
;;
|
;;
|
||||||
*)
|
screen)
|
||||||
printf "\005{= $BACKGROUND$FOREGROUND}"
|
printf "\005{= $BACKGROUND$FOREGROUND}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -28,7 +28,7 @@ __date() {
|
||||||
tmux)
|
tmux)
|
||||||
date +"%Y-%m-%d "
|
date +"%Y-%m-%d "
|
||||||
;;
|
;;
|
||||||
*)
|
screen)
|
||||||
bd=$(date "+%m%d")
|
bd=$(date "+%m%d")
|
||||||
[ "$bd" = "0320" ] && msg="$(echo SGFwcHkgQmlydGhkYXkgU2NyZWVuIC0tIGh0dHA6Ly9iaXQubHkvc2NyZWVuLWJkYXkK | base64 -di)" && $BYOBU_BACKEND -X -S "byobu" at "*" echo "[$msg]"
|
[ "$bd" = "0320" ] && msg="$(echo SGFwcHkgQmlydGhkYXkgU2NyZWVuIC0tIGh0dHA6Ly9iaXQubHkvc2NyZWVuLWJkYXkK | base64 -di)" && $BYOBU_BACKEND -X -S "byobu" at "*" echo "[$msg]"
|
||||||
color none; printf "\005Y-\005m-\005d"; color --
|
color none; printf "\005Y-\005m-\005d"; color --
|
||||||
|
|
|
@ -116,7 +116,7 @@ color() {
|
||||||
tmux)
|
tmux)
|
||||||
color_tmux "$@"
|
color_tmux "$@"
|
||||||
;;
|
;;
|
||||||
*)
|
screen)
|
||||||
color_screen "$@"
|
color_screen "$@"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -28,7 +28,7 @@ __time() {
|
||||||
tmux)
|
tmux)
|
||||||
date +"%H:%M:%S"
|
date +"%H:%M:%S"
|
||||||
;;
|
;;
|
||||||
*)
|
screen)
|
||||||
printf "\0050c:\005s"
|
printf "\0050c:\005s"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue