From 13ad81eaff35eef8e24a345bb665caf4fab77e43 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Tue, 9 Apr 2019 15:23:07 -0500
Subject: [PATCH] Remove the confdir argument

Closes #3266
---
 mitmproxy/tools/_main.py   | 3 +--
 mitmproxy/tools/cmdline.py | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/mitmproxy/tools/_main.py b/mitmproxy/tools/_main.py
index f1c763b2b..b95d73ab7 100644
--- a/mitmproxy/tools/_main.py
+++ b/mitmproxy/tools/_main.py
@@ -87,7 +87,7 @@ def run(
         arg_check.check()
         sys.exit(1)
     try:
-        opts.confdir = args.confdir
+        opts.set(*args.setoptions, defer=True)
         optmanager.load_paths(
             opts,
             os.path.join(opts.confdir, OPTIONS_FILE_NAME),
@@ -110,7 +110,6 @@ def run(
         if args.commands:
             master.commands.dump()
             sys.exit(0)
-        opts.set(*args.setoptions, defer=True)
         if extra:
             opts.update(**extra(args))
 
diff --git a/mitmproxy/tools/cmdline.py b/mitmproxy/tools/cmdline.py
index ad934ca2d..a7820f767 100644
--- a/mitmproxy/tools/cmdline.py
+++ b/mitmproxy/tools/cmdline.py
@@ -20,12 +20,6 @@ def common_options(parser, opts):
         action='store_true',
         help="Show all commands and their signatures",
     )
-    parser.add_argument(
-        "--confdir",
-        type=str, dest="confdir", default=core.CONF_DIR,
-        metavar="PATH",
-        help="Path to the mitmproxy config directory"
-    )
     parser.add_argument(
         "--set",
         type=str, dest="setoptions", default=[],