From a7796bec1be01b51f400e9a3a698535b12b636aa Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 13:44:27 -0500
Subject: [PATCH] Merge branch 'stable-3.1'

---
 server/scripts/run-getmail.sh |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/server/scripts/run-getmail.sh b/server/scripts/run-getmail.sh
index fab297d..3eac5ec 100644
--- a/server/scripts/run-getmail.sh
+++ b/server/scripts/run-getmail.sh
@@ -1,9 +1,20 @@
-#!/bin/sh
+#!/bin/bash
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
 set -e
 cd /etc/getmail
 rcfiles=""
 for file in *.conf ; do
-rcfiles="$rcfiles -r $file"
+  if [ $file != "*.conf" ]; then
+    rcfiles="$rcfiles -r $file"
+  fi
 done
 #echo $rcfiles
-exec /usr/bin/getmail -n -v -g /etc/getmail $rcfiles
\ No newline at end of file
+if [ -f /tmp/.getmail_lock ]; then
+  echo 'Found getmail lock file /tmp/.getmail_lock, we quit here.'
+else
+  touch /tmp/.getmail_lock
+  if [ "$rcfiles" != "" ]; then
+    /usr/bin/getmail -v -g /etc/getmail $rcfiles || true
+  fi
+  rm -f /tmp/.getmail_lock
+fi

--
Gitblit v1.9.1