* usr/bin/byobu-disable-prompt, usr/bin/byobu-enable-prompt:

- ensure we're in a tmux shell
  - ensure we're in a bash shell
  - don't double-reload

debian/changelog

@@ -14,6 +14,10 @@ byobu (5.50) unreleased; urgency=low
     - use a common get_distro function in a couple of places
   * usr/lib/byobu/wifi_quality, usr/share/man/man1/byobu.1:
     - make wifi status a little easier to read
+  * usr/bin/byobu-disable-prompt, usr/bin/byobu-enable-prompt:
+    - ensure we're in a tmux shell
+    - ensure we're in a bash shell
+    - don't double-reload
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 28 Jul 2013 19:51:39 -0500
 

usr/bin/byobu-disable-prompt

@@ -24,13 +24,15 @@ PKG="byobu"
 
 $BYOBU_SED -i -e "/#byobu-prompt#$/d" "$HOME/.bashrc"
 
-if [ "$BYOBU_BACKEND" = "tmux" ]; then
+if [ "$1" != "--no-reload" ]; then
-	tmux send-keys ". ~/.bashrc" \; send-keys Enter
+	if [ -n "$TMUX" ] && [ "$SHELL" = "/bin/bash" ]; then
-else
+		tmux send-keys ". ~/.bashrc" \; send-keys Enter
-	echo
+	else
-	echo "You will need to reload your shell configuration for this to take effect..."
+		echo
-	echo "  . ~/.bashrc"
+		echo "You will need to reload your shell configuration for this to take effect..."
-	echo
+		echo "  . ~/.bashrc"
+		echo
+	fi
 fi
 
 # vi: syntax=sh ts=4 noexpandtab

usr/bin/byobu-enable-prompt

@@ -24,7 +24,7 @@ PKG="byobu"
 
 get_distro
 DISTRO="$_RET"
-byobu-disable-prompt || true
+byobu-disable-prompt --no-reload || true
 case $DISTRO in
 	Ubuntu*)
 		cat >>"$HOME/.bashrc" <<EOF
@@ -40,7 +40,7 @@ EOF
 	;;
 esac
 
-if [ "$BYOBU_BACKEND" = "tmux" ]; then
+if [ -n "$TMUX" ] && [ "$SHELL" = "/bin/bash" ]; then
 	tmux send-keys ". ~/.bashrc" \; send-keys Enter
 else
 	echo