-# and it seems that if we log into mate, it screws up the systemd env var anyways.
-for _file in $(pgrep -a '^ssh-agent$' | sed -r 's/.*-a *([^ ]+).*/\1/'); do
- if test -O "$_file"; then
- export SSH_AUTH_SOCK="$_file"
- break
- fi
-done
-
-# in t11, user ssh-agent once again stopped working, it isn't started anymore
-# by i3. So, enough is enough, I just made a service that will try to
-# start it all the time for the user. If the var isn't set by the above,
-# just set them to the values I know are in the service.
-if ! test "$SSH_AUTH_SOCK"; then
- if [ "$EUID" = 0 ]; then
- export SSH_AUTH_SOCK=/run/openssh_agent
- elif [ "$EUID" = 1000 ]; then
- export SSH_AUTH_SOCK=$HOME/openssh_agent
+
+# i use the x11 prompt for ssh key use which doesnt work
+# within an ssh session (perhaps there is some way).
+# Anyways, there is usually no need for an agent to
+# do a 1-off ssh from a remote machine.
+if ! test "$SSH_CLIENT"; then
+ # and it seems that if we log into mate, it screws up the systemd env var anyways.
+ for _file in $(pgrep -a '^ssh-agent$' | sed -r 's/.*-a *([^ ]+).*/\1/'); do
+ if test -O "$_file"; then
+ export SSH_AUTH_SOCK="$_file"
+ break
+ fi
+ done
+
+ # in t11, user ssh-agent once again stopped working, it isn't started anymore
+ # by i3. So, enough is enough, I just made a service that will try to
+ # start it all the time for the user. If the var isn't set by the above,
+ # just set them to the values I know are in the service.
+ if ! test "$SSH_AUTH_SOCK"; then
+ if [ "$EUID" = 0 ]; then
+ export SSH_AUTH_SOCK=/run/openssh_agent
+ elif [ "$EUID" = 1000 ]; then
+ export SSH_AUTH_SOCK=$HOME/openssh_agent
+ fi