[vte/vte-0-34] prompt: Set PROMPT_COMMAND

[Christian Persch <chpe src gnome org>]

commit b307d45e8b2dd27a3881852c29f4a6f0443d5348
Author: Christian Persch <chpe gnome org>
Date:   Tue Apr 30 20:36:27 2013 +0200

    prompt: Set PROMPT_COMMAND
    
    Use PROMPT_COMMAND to set the cwd. This works for both login and non-login
    shells (at least under F17 and should also work for any other distro that
    sources /etc/profile.d/*.sh both ways).

 src/vte.sh |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)
---
diff --git a/src/vte.sh b/src/vte.sh
index d186305..95fe635 100644
--- a/src/vte.sh
+++ b/src/vte.sh
@@ -15,6 +15,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+# Not bash?
+[ -n "$BASH_VERSION" ] || return
+
+# Not an interactive shell, or not running under vte?
+[ -n "$PS1" -a "${VTE:-0}" -ge 3405 ] || return
+
 __vte_urlencode() (
   # This is important to make sure string manipulation is handled
   # byte-by-byte.
@@ -31,11 +37,22 @@ __vte_urlencode() (
   done
 )
 
-__vte_ps1() (
-  # Only print anything if running in an interactive shell under vte >= 0.34.5
-  [ -n "$PS1" -a "${VTE:-0}" -ge 3405 ] || return
+# Print a warning so that anyone who's added this manually to his PS1 can adapt.
+# The function will be removed in a later version.
+__vte_ps1() {
+  echo -n "(__vte_ps1 is obsolete)"
+}
 
-  printf "\033]7;file://%s" ${HOSTNAME:-$(hostname)}
-  __vte_urlencode "$PWD"
-  printf "\a"
-)
+__vte_osc7 () {
+  printf "\033]7;file://%s%s\a" "$2" "$(__vte_urlencode "$1")"
+}
+
+__vte_prompt_command() {
+  printf "\033]0;%s %s:%s\007%s" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}" "$(__vte_osc7 "${PWD}" 
"${HOSTNAME:-}")"
+}
+
+case "$TERM" in
+  xterm*|vte*)
+    PROMPT_COMMAND="__vte_prompt_command" 
+    ;;
+esac