* usr/bin/byobu-status:

- get detail working again
This commit is contained in:
Dustin Kirkland 2011-06-27 14:04:17 +00:00
commit 15ade53bd7
2 changed files with 10 additions and 8 deletions

2
debian/changelog vendored
View file

@ -36,6 +36,8 @@ byobu (4.14) unreleased; urgency=low
- fix slow/lag associated with testing for metadata server - fix slow/lag associated with testing for metadata server
* usr/lib/byobu/raid: * usr/lib/byobu/raid:
- fix coloring, needed grouping around colored print - fix coloring, needed grouping around colored print
* usr/bin/byobu-status:
- get detail working again
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 16 Jun 2011 16:16:29 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 16 Jun 2011 16:16:29 -0500

View file

@ -73,13 +73,14 @@ case "$P" in
if command -v vim >/dev/null && `vim --version | grep -q +folding`; then if command -v 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" printf " Expand all - zr\t\tCollapse all - zm\n Expand one - zo\t\tCollapse one - zc\n\n"
fi fi
for i in "$BYOBU_PREFIX/lib/$PKG"/* "$DATA/bin"/*; do for i in "$BYOBU_PREFIX/lib/$PKG"/*; do
i=${i##*/} i=${i##*/}
[ "$i" = "menu" ] && continue case "$i" in
menu|notify_osd|time_binary) continue ;;
find_script "$i" && script="${_RET}" esac
short=`$script --short | sed -e 's/^\s*//' -e 's/\s*$//' -e 's/.{[^}]*}//g'` || true find_script "$i" && . "${_RET}"
detail=`$script --detail 2>/dev/null | sed -e '/^$/d' -e 's/^/\t/g'` || true short=$(eval "__${i}" | sed -e 's/^\s*//' -e 's/\s*$//' -e 's/.{[^}]*}//g')
detail=$(eval "__${i}_detail" 2>/dev/null | sed -e '/^$/d' -e 's/^/\t/g')
printf "%s\n\t(%s)\n" "$short" "$i" printf "%s\n\t(%s)\n" "$short" "$i"
[ -n "$detail" ] && printf "%s\n" "$detail" [ -n "$detail" ] && printf "%s\n" "$detail"
done done
@ -95,8 +96,7 @@ case "$P" in
[ "$x" = "1" ] || exit 0 [ "$x" = "1" ] || exit 0
shift shift
find_script "$P" && . "${_RET}" find_script "$P" && . "${_RET}"
local s=${_RET##*/} eval "__${P}"
eval "__$s"
;; ;;
esac esac