]> git.donarmstrong.com Git - bin.git/commitdiff
* use the right ssh_agent_info
authorDon Armstrong <don@donarmstrong.com>
Sun, 18 May 2008 22:48:44 +0000 (22:48 +0000)
committerDon Armstrong <don@donarmstrong.com>
Sun, 18 May 2008 22:48:44 +0000 (22:48 +0000)
getmail

diff --git a/getmail b/getmail
index f38d24cae947aad7d6507a3c165e939e76ba2cd7..3eb978fc14588345fa0b0301b2b57e3cee4ea347 100755 (executable)
--- a/getmail
+++ b/getmail
@@ -12,11 +12,15 @@ if [[ -z "$CRON" && -e ~/.nocheck ]]; then
     exit 0;
 fi;
 
+if [ -z "$HOSTNAME" ]; then
+    HOSTNAME="$(hostname)"
+fi;
+
 # See if the server exists
 if [ -z "$CRON" ] || kill -0 `pgrep -U $(id -u) -x $MUA` 2>/dev/null; then
     if ping -q -c 3 $IMAPHOST >/dev/null 2>&1; then
-       if [ -e ~/.ssh/ssh_agent_info ]; then
-           . ~/.ssh/ssh_agent_info > /dev/null;
+       if [ -e ~/.ssh/ssh_agent_info_$HOSTNAME ]; then
+           . ~/.ssh/ssh_agent_info_$HOSTNAME > /dev/null;
        fi;
        if nice -n 19 offlineimap -o -u Noninteractive.Basic 2>&1 |grep validity| \
            perl -ne 'my ($account,$list) = /UID validity problem for folder ([\w-]+)\.([\w-]+)/;