aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrjt-gupta <rajat.gupta99924@gmail.com>2018-12-17 00:08:27 +0530
committerrjt-gupta <rajat.gupta99924@gmail.com>2018-12-17 00:08:27 +0530
commit4bd992d63c3fd37a921ff48f06382bab2003a4e8 (patch)
treed6072eee06b368f7b68351e28cb488ffa6c554af
parente2bcca47b1ad8040451cbd95039acf200e9b0e84 (diff)
downloadmitmproxy-4bd992d63c3fd37a921ff48f06382bab2003a4e8.tar.gz
mitmproxy-4bd992d63c3fd37a921ff48f06382bab2003a4e8.tar.bz2
mitmproxy-4bd992d63c3fd37a921ff48f06382bab2003a4e8.zip
external-viewer-fix
-rw-r--r--mitmproxy/tools/console/master.py4
1 files 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)