Merge pull request #151 from pdf/master

Fix startup with existing ssh agents
2011-06-25 14:53:31 -07:00 · 2011-06-25 14:53:31 -07:00 · ecaba666a4
parent a9c52ea738 0eb5d6343e
commit ecaba666a4
1 changed files with 5 additions and 1 deletions
--- a/SparkleShare/sparkleshare.in
+++ b/SparkleShare/sparkleshare.in
@ -19,7 +19,11 @@ start() {
  fi

  echo -n "Starting SparkleShare... "
-  ssh-agent mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 &
+  if [ -n "${SSH_AGENT_PID}" -o -n "${SSH_AUTH_SOCK}" ] ; then
+    mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 &
+  else
+    ssh-agent mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 &
+  fi
  ( umask 066; echo $! > ${pidfile} )
  echo "Done."
 }