From 4bd992d63c3fd37a921ff48f06382bab2003a4e8 Mon Sep 17 00:00:00 2001 From: rjt-gupta Date: Mon, 17 Dec 2018 00:08:27 +0530 Subject: external-viewer-fix --- mitmproxy/tools/console/master.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mitmproxy/tools/console/master.py b/mitmproxy/tools/console/master.py index dd15a2f5..6ab9ba5a 100644 --- a/mitmproxy/tools/console/master.py +++ b/mitmproxy/tools/console/master.py @@ -120,7 +120,7 @@ class ConsoleMaster(master.Master): with open(fd, "w" if text else "wb") as f: f.write(data) # if no EDITOR is set, assume 'vi' - c = os.environ.get("EDITOR") or "vi" + c = os.environ.get("MITMPROXY_EDITOR") or os.environ.get("EDITOR") or "vi" cmd = shlex.split(c) cmd.append(name) with self.uistopped(): @@ -159,7 +159,7 @@ class ConsoleMaster(master.Master): shell = True if not cmd: # hm which one should get priority? - c = os.environ.get("PAGER") or os.environ.get("EDITOR") + c = os.environ.get("MITMPROXY_EDITOR") or os.environ.get("PAGER") or os.environ.get("EDITOR") if not c: c = "less" cmd = shlex.split(c) -- cgit v1.2.3 From 1ee54f7d739afb34063712b71db2bf892d1dd663 Mon Sep 17 00:00:00 2001 From: rjt-gupta Date: Mon, 7 Jan 2019 23:17:11 +0530 Subject: option added --- mitmproxy/tools/console/consoleaddons.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mitmproxy/tools/console/consoleaddons.py b/mitmproxy/tools/console/consoleaddons.py index a40cdeaa..ba14eeb6 100644 --- a/mitmproxy/tools/console/consoleaddons.py +++ b/mitmproxy/tools/console/consoleaddons.py @@ -113,6 +113,11 @@ class ConsoleAddon: "console_mouse", bool, True, "Console mouse interaction." ) + loader.add_option( + "console_external_viewer_default", str, "vi", + "External viewer for flow body. Set environment variable $MITMPROXY_EDITOR " + "to change default." + ) @command.command("console.layout.options") def layout_options(self) -> typing.Sequence[str]: -- cgit v1.2.3 From f8926170a5be481ff4cb2dd181ead95b0ec081cb Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 15 Nov 2019 17:22:41 +0100 Subject: remove superfluous option --- mitmproxy/tools/console/consoleaddons.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mitmproxy/tools/console/consoleaddons.py b/mitmproxy/tools/console/consoleaddons.py index ba14eeb6..a40cdeaa 100644 --- a/mitmproxy/tools/console/consoleaddons.py +++ b/mitmproxy/tools/console/consoleaddons.py @@ -113,11 +113,6 @@ class ConsoleAddon: "console_mouse", bool, True, "Console mouse interaction." ) - loader.add_option( - "console_external_viewer_default", str, "vi", - "External viewer for flow body. Set environment variable $MITMPROXY_EDITOR " - "to change default." - ) @command.command("console.layout.options") def layout_options(self) -> typing.Sequence[str]: -- cgit v1.2.3