diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2019-11-15 17:23:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 17:23:01 +0100 |
| commit | f6f9eb2c4e022cd44ccc39b3f61fdf31cbfea793 (patch) | |
| tree | c846eb376bf3ee38acb2556ccbbf78d69ddc22a2 | |
| parent | 4f81f1ee4131f73b269713b77f8afaa14b6d841e (diff) | |
| parent | f8926170a5be481ff4cb2dd181ead95b0ec081cb (diff) | |
| download | mitmproxy-f6f9eb2c4e022cd44ccc39b3f61fdf31cbfea793.tar.gz mitmproxy-f6f9eb2c4e022cd44ccc39b3f61fdf31cbfea793.tar.bz2 mitmproxy-f6f9eb2c4e022cd44ccc39b3f61fdf31cbfea793.zip | |
Merge pull request #3425 from rjt-gupta/external-viewer
external-viewer-fix
| -rw-r--r-- | mitmproxy/tools/console/master.py | 4 |
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) |