updated for new paths also, which revealed a few locations that are

[feisty_meow.git] / scripts / security / ssh.sh

diff --git a/scripts/security/ssh.sh b/scripts/security/ssh.sh
old mode 100755 (executable)
new mode 100644 (file)
index ca226c3..064ecf8
--- a/scripts/security/ssh.sh
+++ b/scripts/security/ssh.sh
@@ -2,9 +2,13 @@
 
 # wraps our calling the secure shell and lets us pick our credentials.
 
-source "$FEISTY_MEOW_SCRIPTS/pick_credentials.sh"
+source "$FEISTY_MEOW_SCRIPTS/security/pick_credentials.sh"
 
-\ssh -i "$keyfile" -X $*
+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.