From 788176d1ce8cbdff2fb10733d23b3a226969e14f Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@canonical.com>
Date: Mon, 7 Dec 2009 13:16:59 -0600
Subject: [PATCH] bin/custom, byobu-status: support --detail in custom scripts

---
 bin/custom       | 2 +-
 byobu-status     | 2 +-
 debian/changelog | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/custom b/bin/custom
index 1c43c78c..23e9f5e6 100755
--- a/bin/custom
+++ b/bin/custom
@@ -35,7 +35,7 @@ for i in $(ls "$HOME/.$PKG/bin/"[0-9]*_* 2>/dev/null); do
 	expiration=$(expr $lastrun + $freq)
 	if [ $NOW -ge $expiration ]; then
 		# Update the cache
-		$i > "$CACHE.$script" 2>/dev/null
+		$i $@ > "$CACHE.$script" 2>/dev/null
 	fi
 	output=$(cat "$CACHE.$script")
 	if echo "$output" | grep -qs "$ESC{"; then
diff --git a/byobu-status b/byobu-status
index 7b0b4507..e00de9ae 100755
--- a/byobu-status
+++ b/byobu-status
@@ -43,7 +43,7 @@ case "$P" in
 			VER=`dpkg-query --show $PKG | awk '{print "-" $2 }'`
 		fi
 		printf "$PKG$VER Detailed Status Navigation\n  Expand all - zr\t\tCollapse all - zm\n  Expand one - zo\t\tCollapse one - zc\n\n"
-		for i in $(ls "/usr/lib/$PKG" "$HOME/.$PKG/bin" 2>/dev/null); do
+		for i in $(ls "/usr/lib/$PKG" "$HOME/.$PKG/bin" 2>/dev/null | grep -v "^/" | sort -u); do
 			[ "$i" = "menu" ] && continue
 			script=`find_script $i`
 			short=`$script --short | sed 's/^\s*//' | sed 's/\s*$//' | sed 's/.{[^}]*}//g'` || true
diff --git a/debian/changelog b/debian/changelog
index 6bf8c3b4..88705ca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,7 @@ byobu (2.40) unreleased; urgency=low
     statusrc: add support for a custom status script indicator
   * byobu-config, byobu-select-profile: make color selection more readable;
     support ctrl-<space> escape sequence
+  * bin/custom, byobu-status: support --detail in custom scripts
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 10 Nov 2009 10:18:20 -0600