From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 17 Jan 2015 02:04:19 +0000 (-0500)
Subject: moving this to not get in people's way.
X-Git-Tag: 2.140.90~720
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=8073cc2cd6592bd40eec84f6db59e0aa01b28321;hp=1af1e28236fe8ee9d6ccc158ef1b2b4755707a44;p=feisty_meow.git

moving this to not get in people's way.
---

diff --git a/customizing/fred/aliases/ssh.sh b/customizing/fred/aliases/ssh.sh
new file mode 100755
index 00000000..064ecf8a
--- /dev/null
+++ b/customizing/fred/aliases/ssh.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# wraps our calling the secure shell and lets us pick our credentials.
+
+source "$FEISTY_MEOW_SCRIPTS/security/pick_credentials.sh"
+
+if [ ! -z "$keyfile" ]; then
+  \ssh -i "$keyfile" -X $*
+else
+  \ssh -X $*
+fi
+
+if [ $? -eq 0 ]; then
+  # 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
+
+
diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 2394821b..dbef4552 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -129,8 +129,8 @@ if [ -z "$NECHUNG" ]; then
   export NECHUNG=$FEISTY_MEOW_DIR/infobase/fortunes.dat
   
   # ensure we use the right kind of secure shell.
-  export CVS_RSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
-  export GIT_SSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
+#  export CVS_RSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
+#  export GIT_SSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
   
   # the base checkout list is just to update feisty_meow.  additional folder
   # names can be added in your customized scripts.  the space at the end of
diff --git a/scripts/security/ssh.sh b/scripts/security/ssh.sh
deleted file mode 100755
index 064ecf8a..00000000
--- a/scripts/security/ssh.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# wraps our calling the secure shell and lets us pick our credentials.
-
-source "$FEISTY_MEOW_SCRIPTS/security/pick_credentials.sh"
-
-if [ ! -z "$keyfile" ]; then
-  \ssh -i "$keyfile" -X $*
-else
-  \ssh -X $*
-fi
-
-if [ $? -eq 0 ]; then
-  # 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
-
-