From 823125c89983292f9cd5ce01ea5e248e209c5b70 Mon Sep 17 00:00:00 2001
From: Patrick Ulbrich <zulu99@gmx.net>
Date: Mon, 15 Dec 2014 22:39:15 +0100
Subject: [PATCH] Add --foreground and --verbose options as suggested in #87

---
 Mailnag/mailnag.py | 7 ++++++-
 mailnagd           | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Mailnag/mailnag.py b/Mailnag/mailnag.py
index bcc9262..af46945 100644
--- a/Mailnag/mailnag.py
+++ b/Mailnag/mailnag.py
@@ -33,6 +33,7 @@ import os
 import signal
 
 from common.config import cfg_exists
+from common.dist_cfg import APP_VERSION
 from common.utils import set_procname, shutdown_existing_instance
 from common.subproc import terminate_subprocesses
 from common.exceptions import InvalidOperationException
@@ -67,8 +68,12 @@ def cleanup(daemon):
 
 def get_args():
 	parser = argparse.ArgumentParser(prog=PROGNAME)
-	parser.add_argument('--quiet', action = 'store_true', 
+	parser.add_argument('-q', '--quiet', action = 'store_true', 
 		help = "don't print log messages to stdout")
+	parser.add_argument('-v', '--version', action = 'version',
+		version = 'Mailnag %s' % APP_VERSION)
+	parser.add_argument('-f', '--foreground', action = 'store_true',
+		help = "don't run mailnagd in daemon mode")
 	
 	return parser.parse_args()
 
diff --git a/mailnagd b/mailnagd
index 7fe8e08..0b764c4 100755
--- a/mailnagd
+++ b/mailnagd
@@ -2,5 +2,9 @@
 LIB_DIR=./Mailnag
 
 cd $(dirname $(readlink -f $0))
-python2 $LIB_DIR/mailnag.py $@ &
 
+if [ $# -eq 0 ] || [ $1 == "--quiet" ] || [ $1 == "-q" ]; then
+	python2 $LIB_DIR/mailnag.py $@ &
+else 
+	python2 $LIB_DIR/mailnag.py $@
+fi