From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 4 Mar 2012 04:23:31 +0000 (-0500)
Subject: trapping git calling us.
X-Git-Tag: 2.140.90~1528
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=3a884022a9aa69a5b682b525bcadf308f14cd8ae;p=feisty_meow.git

trapping git calling us.
---

diff --git a/scripts/tty/ssh.sh b/scripts/tty/ssh.sh
index 84c9f61b..38b7ab1c 100755
--- a/scripts/tty/ssh.sh
+++ b/scripts/tty/ssh.sh
@@ -19,9 +19,12 @@ echo hey we be on wik dese parms $* >~/crap.txt
 \ssh -i "$keyfile" -X $*
 
 if [ $? -eq 0 ]; then
-  # re-run the terminal labeller after coming back from ssh.
-  # we check the exit value because we don't want to update this for a failed connection.
-  bash $FEISTY_MEOW_SCRIPTS/tty/label_terminal_with_infos.sh
+  # we don't want to emit anything extra if this is being driven by git.
+  if [ -z "$(echo $* | grep git)" ]; then
+    # re-run the terminal labeller after coming back from ssh.
+    # we check the exit value because we don't want to update this for a failed connection.
+    bash $FEISTY_MEOW_SCRIPTS/tty/label_terminal_with_infos.sh
+  fi
 fi