2 files changed, 12 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fd156e1def7b..6ee8b9835b76 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = py-mailqueued-mta
 	pkgdesc = Uses py-mailqueued as an MTA for msmtp
-	pkgver = 0.1.0
+	pkgver = 0.2.0
 	pkgrel = 1
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index ca2a1a218e59..2c18b7f29482 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ingo Meyer <i.meyer@fz-juelich.de>
 
 pkgname="py-mailqueued-mta"
-pkgver="0.1.0"
+pkgver="0.2.0"
 pkgrel="1"
 pkgdesc="Uses py-mailqueued as an MTA for msmtp"
 arch=("any")
@@ -14,7 +14,16 @@ package() {
     cd "${pkgdir}" || return
     mkdir -p "usr/bin" && \
     cat <<-EOF >"usr/bin/sendmail" || return
-		#!/bin/sh
+		#!/bin/bash
+
+		# \`DBUS_SESSION_BUS_ADDRESS\` is not set if the script is run from a cron job
+		# so extract it from the running process environments
+		if [[ -z "\${DBUS_SESSION_BUS_ADDRESS}" ]]; then
+		    eval "\$(ps -u "\${USER}" e -e -o cmd | \\
+		        awk '\$0 ~ /^[^[:space:]]*dbus-daemon.*[[:space:]]--session/ { for(i=2; i<=NF; i++) print \$i }' | \\
+		        awk '{ sub(/=/," ") }1' | \\
+		        awk '\$1 == "DBUS_SESSION_BUS_ADDRESS" { printf "export %s=\"%s\"", \$1, \$2 }')"
+		fi
 
 		/usr/bin/mail-queue /usr/bin/msmtp "\$@"
 	EOF