Add notmuch-config switch back in.

The order of overriding is (highest priority first):
    command-line switch (--notmuch-config)
    environment variable ($NOTMUCH_CONFIG)
    default (~/.notmuch-config)

1 files changed, 5 insertions, 3 deletions

diff --git a/alot/init.py b/alot/init.py
index 7191324c..a9145de8 100755
--- a/alot/init.py
+++ b/alot/init.py
@@ -85,6 +85,7 @@ class Options(usage.Options):
 
     optParameters = [
             ['config', 'c', None, 'config file'],
+            ['notmuch-config', 'n', None, 'notmuch config'],
             ['colour-mode', 'C', None, 'terminal colour mode', colourint],
             ['mailindex-path', 'p', None, 'path to notmuch index'],
             ['debug-level', 'd', 'info', 'debug log', debuglogstring],
@@ -136,9 +137,10 @@ def main():
         configfiles.insert(0, expanded_path)
 
     # locate notmuch config
-    notmuchconfig = os.path.expanduser(os.environ.get('NOTMUCH_CONFIG',
-                                       '~/.notmuch-config'))
-
+    notmuchpath = os.environ.get('NOTMUCH_CONFIG', '~/.notmuch-config')
+    if args['notmuch-config']:
+        notmuchpath = args['notmuch-config']
+    notmuchconfig = os.path.expanduser(notmuchpath)
 
     alotconfig = None
     # read the first alot config file we find