From e0a0d1621df12a42263c8f91732f9d210dbebc1b Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Wed, 13 Jul 2011 21:14:48 -0500 Subject: [PATCH] * experimental/byobu-classroom, usr/bin/byobu-statusd, usr/bin/byobu- status-print, usr/lib/byobu/battery, usr/share/byobu/profiles/classroom: - fixup byobu-classroom - fix whitespace printing in byobu-status-print --- debian/changelog | 5 +++++ experimental/byobu-classroom | 4 +++- usr/bin/byobu-status-print | 5 +---- usr/bin/byobu-statusd | 2 +- usr/lib/byobu/battery | 12 ++++++------ usr/share/byobu/profiles/classroom | 5 ++--- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7650b8bf..accc23e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,11 @@ byobu (4.18) unreleased; urgency=low tmux to interpret the time format sequence) - install the tmux profile - get the tmux profile using the new status print methodology + * experimental/byobu-classroom, usr/bin/byobu-statusd, usr/bin/byobu- + status-print, usr/lib/byobu/battery, + usr/share/byobu/profiles/classroom: + - fixup byobu-classroom + - fix whitespace printing in byobu-status-print [ James Spencer ] * usr/lib/byobu/.constants: diff --git a/experimental/byobu-classroom b/experimental/byobu-classroom index 661fc93b..2ca9a59f 100755 --- a/experimental/byobu-classroom +++ b/experimental/byobu-classroom @@ -98,6 +98,8 @@ while [ $(stat -c%a "$screen") != "6755" ]; do case "$c" in y|Y) dpkg-statoverride --add root root 6755 "$screen" + chmod 6755 "$screen" + chmod 755 /var/run/screen info "Updated $screen" echo info "To revert this later, run:" @@ -111,7 +113,7 @@ while [ $(stat -c%a "$screen") != "6755" ]; do done # Ensure correct permissions on screen's run directory -service restart screen-cleanup +service screen-cleanup start # Ensure that SSH configuration is correct while [ $(grep -c "#byobu-classrom" /etc/ssh/sshd_config) != "4" ]; do diff --git a/usr/bin/byobu-status-print b/usr/bin/byobu-status-print index 86416739..ebf75bad 100755 --- a/usr/bin/byobu-status-print +++ b/usr/bin/byobu-status-print @@ -25,11 +25,8 @@ PKG="byobu" while read i; do cache="$BYOBU_RUN_DIR/status/$i" if [ -s "$cache" ]; then + IFS= read c < "$cache" printf "%s" "$c" - case "$i" in - color|menu|time) true ;; - *) printf " " ;; - esac fi done < "$BYOBU_CONFIG_DIR/status.$1" diff --git a/usr/bin/byobu-statusd b/usr/bin/byobu-statusd index e3b64280..d30e88be 100755 --- a/usr/bin/byobu-statusd +++ b/usr/bin/byobu-statusd @@ -1,6 +1,6 @@ #!/bin/sh # -# byobu-status-print: concatenate the status cache +# byobu-statusd: byobu's status gathering daemon # # Copyright (C) 2011 Dustin Kirkland # diff --git a/usr/lib/byobu/battery b/usr/lib/byobu/battery index f475c3eb..e266446e 100755 --- a/usr/lib/byobu/battery +++ b/usr/lib/byobu/battery @@ -54,14 +54,14 @@ __battery() { done < "$bat/state" percent=$(((100*$rem)/$full)) if [ "$percent" -lt 33 ]; then - color="R w" - bcolor="b R w" + color="R k" + bcolor="b R k" elif [ "$percent" -lt 67 ]; then - color="Y w" - bcolor="b Y w" + color="Y k" + bcolor="b Y k" else - color="G w" - bcolor="b G w" + color="G k" + bcolor="b G k" fi percent="$percent%" case $state in diff --git a/usr/share/byobu/profiles/classroom b/usr/share/byobu/profiles/classroom index 53e6ab9f..6a1e614c 100644 --- a/usr/share/byobu/profiles/classroom +++ b/usr/share/byobu/profiles/classroom @@ -20,9 +20,8 @@ # along with this program. If not, see . ############################################################################### -source /usr/share/byobu/profiles/byoburc - aclumask guest+r guest-w guest-x aclchg guest +r-w-x '#?' -aclchg guest +x 'prev,next,select,detach' +aclchg guest +x 'detach' multiuser on +escape "^Bb"