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

* usr/bin/byobu-statusd:

Browse source 
- check that file is readable before sourcing
* usr/lib/byobu/mem_available:
  - no need to source status here any more
* usr/share/byobu/keybindings/f-keys, usr/share/byobu/profiles/common:
  - move the kill of statusd to the profile, near the launching of
    statusd
This commit is contained in:
Dustin Kirkland 2011-07-19 18:03:45 -05:00
commit 2cda916797
5 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
debian/changelog vendored
View file

@ -117,6 +117,13 @@ byobu (4.18) unreleased; urgency=low
usr/share/byobu/profiles/byoburc, usr/share/byobu/profiles/common, usr/share/byobu/profiles/byoburc, usr/share/byobu/profiles/common,
usr/share/byobu/profiles/screenrc: usr/share/byobu/profiles/screenrc:
- killall byobu-statusd owned by user before refreshing - killall byobu-statusd owned by user before refreshing
* usr/bin/byobu-statusd:
- check that file is readable before sourcing
* usr/lib/byobu/mem_available:
- no need to source status here any more
* usr/share/byobu/keybindings/f-keys, usr/share/byobu/profiles/common:
- move the kill of statusd to the profile, near the launching of
statusd
[ James Spencer ] [ James Spencer ]
* usr/lib/byobu/.constants: * usr/lib/byobu/.constants:

2
usr/bin/byobu-statusd
View file

@ -41,7 +41,7 @@ while true; do
now=$(date +%s) now=$(date +%s)
# Re-source configuration, if changed since last run # Re-source configuration, if changed since last run
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_PREFIX}/lib/$PKG/."*; do 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_PREFIX}/lib/$PKG/."*; do
[ "$i" -nt "$BYOBU_RUN_DIR/status" ] && . "$i" [ -r "$i" ] && [ "$i" -nt "$BYOBU_RUN_DIR/status" ] && . "$i"
done done
for i in "$BYOBU_PREFIX/lib/$PKG/"*; do for i in "$BYOBU_PREFIX/lib/$PKG/"*; do
case "$i" in case "$i" in

1
usr/lib/byobu/mem_available
View file

@ -25,7 +25,6 @@ __mem_available_detail() {
__mem_available() { __mem_available() {
local mem_used comma whitespace unit mem name local mem_used comma whitespace unit mem name
. "$BYOBU_CONFIG_DIR/status"
[ "$mem_used" = "1" ] && comma="," || whitespace=" " [ "$mem_used" = "1" ] && comma="," || whitespace=" "
read name mem unit < /proc/meminfo read name mem unit < /proc/meminfo
if [ $mem -ge 1048576 ]; then if [ $mem -ge 1048576 ]; then

2
usr/share/byobu/keybindings/f-keys
View file

@ -31,7 +31,7 @@ bindkey -k k2 $BYOBU_BACKEND # F2 | Create new window
bindkey -k k3 eval 'prev' 'fit' # F3 | Previous Window bindkey -k k3 eval 'prev' 'fit' # F3 | Previous Window
bindkey -k k4 eval 'next' 'fit' # F4 | Next Window bindkey -k k4 eval 'next' 'fit' # F4 | Next Window
register r ":source $BYOBU_CONFIG_DIR/profile^M" # | Goes with F5 definition register r ":source $BYOBU_CONFIG_DIR/profile^M" # | Goes with F5 definition
bindkey -k k5 eval 'exec killall -u $USER byobu-statusd' 'process x' 'process r' # F5 | Reload profile bindkey -k k5 eval 'process x' 'process r' # F5 | Reload profile
bindkey -k k6 detach # F6 | Detach from this session bindkey -k k6 detach # F6 | Detach from this session
bindkey -k k7 copy # F7 | Enter copy/scrollback mode bindkey -k k7 copy # F7 | Enter copy/scrollback mode
register t "A^[OH^k^h" # | Goes with the F8 definition register t "A^[OH^k^h" # | Goes with the F8 definition

2
usr/share/byobu/profiles/common
View file

@ -28,6 +28,8 @@ msgminwait 0
defutf8 on defutf8 on
deflogin on deflogin on
# We don't need/want more than one byobu-statusd running per user
exec killall -u $USER byobu-statusd
backtick 10 9999999 9999999 byobu-janitor backtick 10 9999999 9999999 byobu-janitor
backtick 11 9999999 9999999 printf "\005-1=" backtick 11 9999999 9999999 printf "\005-1="
backtick 12 9999999 9999999 byobu-status color backtick 12 9999999 9999999 byobu-status color