normalized perms on all files, to avoid relying on any stored executable bits in...

[feisty_meow.git] / customizing / fred / scripts / ssh.sh

diff --git a/customizing/fred/scripts/ssh.sh b/customizing/fred/scripts/ssh.sh
old mode 100755 (executable)
new mode 100644 (file)
index 660071e..13d57fa
--- a/customizing/fred/scripts/ssh.sh
+++ b/customizing/fred/scripts/ssh.sh
@@ -2,18 +2,30 @@
 
 # wraps our calling the secure shell and lets us pick our credentials.
 
-source "$FEISTY_MEOW_GENERATED/custom/scripts/pick_credentials.sh"
+source "$FEISTY_MEOW_LOADING_DOCK/custom/scripts/pick_credentials.sh"
 
-# save the former terminal title if we're running in X.
+# save the former terminal title if we're running in X with xterm.
 prior_title=
-if [ ! -z "$DISPLAY" ]; then
+if [ "$TERM" == "xterm" ]; then
   prior_title="$(xprop -id $WINDOWID | perl -nle 'print $1 if /^WM_NAME.+= \"(.*)\"$/')"
 fi
 
+# force the TERM variable to a more generic version for other side.
+# we don't want the remote side still thinking it's running xterm.
+export TERM=linux
+
+#hmmm: it would be good to set an interrupt handler here and
+#      trap ctrl-c, since otherwise we are getting exited from and losing a chance
+#      to reset the terminal title.  this actually happens a lot, since some X11
+#      or other background process is left running and the ssh never actually quits,
+#      forcing one to hit ctrl-c.
+
 if [ ! -z "$keyfile" ]; then
-  \ssh -i "$keyfile" -X -C -c blowfish-cbc $*
+  \ssh -i "$keyfile" -X -C $*
+#-c blowfish-cbc 
 else
-  \ssh -X -C -c blowfish-cbc $*
+  \ssh -X -C $*
+#-c blowfish-cbc 
 fi
 
 if [ $? -eq 0 ]; then