* usr/bin/byobu-janitor, usr/share/byobu/profiles/common:

- revert the byobu-statusd changes in the profile
  - it's just not ready yet
  - LP: #814264, #816871
This commit is contained in:
Dustin Kirkland 2011-07-27 23:53:12 -05:00
commit 669d715153
3 changed files with 58 additions and 19 deletions

4
debian/changelog vendored
View file

@ -2,6 +2,10 @@ byobu (4.23) unreleased; urgency=low
* usr/bin/byobu-shell: * usr/bin/byobu-shell:
- MOTD message does not need to be Ubuntu-specific - MOTD message does not need to be Ubuntu-specific
* usr/bin/byobu-janitor, usr/share/byobu/profiles/common:
- revert the byobu-statusd changes in the profile
- it's just not ready yet
- LP: #814264, #816871
-- Dustin Kirkland <kirkland@ubuntu.com> Sun, 24 Jul 2011 14:23:38 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Sun, 24 Jul 2011 14:23:38 -0500

View file

@ -37,11 +37,6 @@ PROFILE="$BYOBU_CONFIG_DIR/profile"
# Create byobu-exchange buffer file, with secure permissions, if it doesn't exist # 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" [ -e "$BYOBU_RUN_DIR/printscreen" ] || install -m 600 /dev/null "$BYOBU_RUN_DIR/printscreen"
# Set up status ordering symlinks
for i in 1 2 3 4; do
[ -e "$BYOBU_CONFIG_DIR/status.$i" ] || ln -s "${BYOBU_PREFIX}/share/${PKG}/status/$i" "$BYOBU_CONFIG_DIR/status.$i"
done
# Affects: users who launched using sudo, such that their config dir # Affects: users who launched using sudo, such that their config dir
# is not writable by them # is not writable by them
if [ -d "$BYOBU_CONFIG_DIR" ] && [ ! -w "$BYOBU_CONFIG_DIR" ]; then if [ -d "$BYOBU_CONFIG_DIR" ] && [ ! -w "$BYOBU_CONFIG_DIR" ]; then

View file

@ -28,17 +28,58 @@ msgminwait 0
defutf8 on defutf8 on
deflogin on deflogin on
# We don't need/want more than one byobu-statusd running per user # Define status commands
exec killall -u $USER byobu-statusd # Use prime number intervals, to decrease collisions, which
backtick 10 9999999 9999999 byobu-janitor # yields some less expensive status updates.
backtick 11 9999999 9999999 printf "\005-1=" # ~86000 ~1 day
backtick 12 9999999 9999999 byobu-status color # ~600 ~10 minutes
backtick 13 0 0 byobu-status notify_osd # ~180 ~3 minutes
backtick 1000 0 0 byobu-statusd # ~60 ~1 minute
backtick 1001 1 1 byobu-status-print 1 backtick 10 9999999 9999999 byobu-janitor
backtick 1002 1 1 byobu-status-print 2 backtick 11 9999999 9999999 printf "\005-1="
backtick 1003 1 1 byobu-status-print 3 backtick 12 9999999 9999999 byobu-status color
backtick 1004 1 1 byobu-status-print 4 backtick 13 0 0 byobu-status notify_osd
backtick 99 9999999 9999999 byobu-status logo
backtick 100 599 599 byobu-status release
backtick 101 7 7 byobu-status updates_available
backtick 102 5 5 byobu-status reboot_required
backtick 103 2 2 byobu-status cpu_freq
backtick 104 5 5 byobu-status cpu_count
backtick 105 47 47 byobu-status mem_available
backtick 106 2 2 byobu-status load_average
backtick 107 13 13 byobu-status mem_used
backtick 108 601 601 byobu-status ec2_cost
backtick 109 607 607 byobu-status hostname
backtick 110 86029 86029 byobu-status whoami
backtick 111 9999999 9999999 byobu-status menu
backtick 112 9999999 9999999 byobu-status arch
backtick 113 61 61 byobu-status battery
backtick 114 11 11 byobu-status users
backtick 115 29 29 byobu-status uptime
backtick 116 7 7 byobu-status processes
backtick 117 3 3 byobu-status network
backtick 118 9999999 9999999 true
backtick 119 17 17 byobu-status wifi_quality
backtick 120 28793 28793 byobu-status date
backtick 121 9999999 9999999 byobu-status time
backtick 122 127 127 byobu-status ip_address
backtick 123 13 13 byobu-status disk
backtick 124 9999999 9999999 true
backtick 125 19 19 byobu-status cpu_temp
backtick 126 9999999 9999999 true
backtick 127 5 5 byobu-status mail
backtick 128 23 23 byobu-status fan_speed
backtick 129 67 67 byobu-status apport
backtick 130 5 5 byobu-status custom
backtick 131 53 53 byobu-status services
backtick 132 11 11 byobu-status time_utc
backtick 133 3 3 byobu-status disk_io
backtick 134 613 613 byobu-status rcs_cost
backtick 135 7 7 byobu-status raid
backtick 136 19 19 byobu-status swap
backtick 137 23 23 byobu-status time_binary
hardstatus alwayslastline
# The following line would turn off alternate Screen switching in xterms, # The following line would turn off alternate Screen switching in xterms,
# so that text in Screen will go into the xterm's scrollback buffer. # so that text in Screen will go into the xterm's scrollback buffer.
@ -70,11 +111,10 @@ fit
setenv SSH_AUTH_SOCK $BYOBU_CONFIG_DIR/.ssh-agent setenv SSH_AUTH_SOCK $BYOBU_CONFIG_DIR/.ssh-agent
# Window tabs, second to last line # Window tabs, second to last line
caption always "%12`%1001`%?%-Lw%50L>%?%{=r}%n*%f %t%?(%u)%?%{-}%12`%?%+Lw%?%11` %=%12`%1002`%10`%<" caption always "%12`%?%-Lw%50L>%?%{=r}%n*%f %t%?(%u)%?%{-}%12`%?%+Lw%?%11` %=%12`%110`%109`%122`%111`%10`%<"
# Status string, last line # Status string, last line
hardstatus alwayslastline hardstatus string '%99`%{-}%{=r}%12` %100`%112`%=%117`%133`%130`%135`%102`%101`%129`%131`%127`%114`%115`%108`%134`%128`%125`%126`%113`%119`%116`%106`%104`%103`%105`%107`%136`%123`%137`%132`%120`%121`'
hardstatus string '%1003`%=%1004`'
# NOTE: Older version of Screen have an arbitrary limit of only being able # NOTE: Older version of Screen have an arbitrary limit of only being able
# to change colors 16 times in this 'hardstatus string'. # to change colors 16 times in this 'hardstatus string'.