* usr/bin/byobu-status, usr/lib/byobu/notify_osd:

- fix all detail printing
This commit is contained in:
Dustin Kirkland 2010-11-07 09:18:02 -06:00
commit 83c351f01f
3 changed files with 7 additions and 2 deletions

2
debian/changelog vendored
View file

@ -48,6 +48,8 @@ byobu (3.7) unreleased; urgency=low
usr/lib/byobu/Makefile.am, usr/lib/byobu/raid,
usr/share/byobu/profiles/common, usr/share/man/man1/byobu.1:
- add a raid notification, LP: #669191
* usr/bin/byobu-status, usr/lib/byobu/notify_osd:
- fix all detail printing
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 21 Oct 2010 12:09:14 -0500

View file

@ -75,7 +75,7 @@ case "$P" in
[ "$i" = "menu" ] && continue
script=`find_script $i`
short=`$script --short | sed -e 's/^\s*//' -e 's/\s*$//' -e 's/.{[^}]*}//g'` || true
detail=`$script --detail | sed -e '/^$/d' -e 's/^/\t/g'` || true
detail=`$script --detail 2>/dev/null | sed -e '/^$/d' -e 's/^/\t/g'` || true
printf "%s\n\t(%s)\n" "$short" "$i"
[ -n "$detail" ] && printf "%s\n" "$detail"
done

View file

@ -22,8 +22,11 @@ LOG="$HOME"/.cache/notify-osd.log
[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr"
case "$1" in
--short)
exit 0
;;
--detail)
cat "$LOG"
cat "$LOG" || true
exit 0
;;
esac