From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sat, 30 Jan 2016 07:44:29 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 server/scripts/run-getmail.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/scripts/run-getmail.sh b/server/scripts/run-getmail.sh
index 13e514c..3eac5ec 100644
--- a/server/scripts/run-getmail.sh
+++ b/server/scripts/run-getmail.sh
@@ -1,4 +1,4 @@
-#!/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
@@ -14,7 +14,7 @@
 else
   touch /tmp/.getmail_lock
   if [ "$rcfiles" != "" ]; then
-    /usr/bin/getmail -n -v -g /etc/getmail $rcfiles
+    /usr/bin/getmail -v -g /etc/getmail $rcfiles || true
   fi
   rm -f /tmp/.getmail_lock
 fi

--
Gitblit v1.9.1