From 08c6739c9b28791f579c92793a7a970d1be06f19 Mon Sep 17 00:00:00 2001 From: gtalarico Date: Tue, 8 May 2018 22:33:21 -0400 Subject: [PATCH 1/2] Espace spaces on cmder shell path - Fixes #2115 --- pipenv/patched/pew/pew.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pipenv/patched/pew/pew.py b/pipenv/patched/pew/pew.py index 2d3889a008..91f313c15d 100644 --- a/pipenv/patched/pew/pew.py +++ b/pipenv/patched/pew/pew.py @@ -184,7 +184,8 @@ def fork_bash(env, cwd): def fork_cmder(env, cwd): shell_cmd = ['cmd'] - cmderrc_path = r'%CMDER_ROOT%\vendor\init.bat' + escaped_cmder_root = os.environ['CMDER_ROOT'].replace(' ', '^ ') + cmderrc_path = r'{0}\vendor\init.bat'.format(escaped_cmder_root) if expandpath(cmderrc_path).exists(): shell_cmd += ['/k', cmderrc_path] if cwd: From 51a0fbf72ba29ff1380fb0d87839a74811829a7a Mon Sep 17 00:00:00 2001 From: gtalarico Date: Wed, 9 May 2018 01:00:30 -0400 Subject: [PATCH 2/2] Added vendor patch --- .../patched/pew-cmder-root-space-escape-fix.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 tasks/vendoring/patches/patched/pew-cmder-root-space-escape-fix.patch diff --git a/tasks/vendoring/patches/patched/pew-cmder-root-space-escape-fix.patch b/tasks/vendoring/patches/patched/pew-cmder-root-space-escape-fix.patch new file mode 100644 index 0000000000..eb0e3d8296 --- /dev/null +++ b/tasks/vendoring/patches/patched/pew-cmder-root-space-escape-fix.patch @@ -0,0 +1,14 @@ +diff --git a/pipenv/patched/pew/pew.py b/pipenv/patched/pew/pew.py +index 2d3889a0..91f313c1 100644 +--- a/pipenv/patched/pew/pew.py ++++ b/pipenv/patched/pew/pew.py +@@ -184,7 +184,8 @@ def fork_bash(env, cwd): + + def fork_cmder(env, cwd): + shell_cmd = ['cmd'] +- cmderrc_path = r'%CMDER_ROOT%\vendor\init.bat' ++ escaped_cmder_root = os.environ['CMDER_ROOT'].replace(' ', '^ ') ++ cmderrc_path = r'{0}\vendor\init.bat'.format(escaped_cmder_root) + if expandpath(cmderrc_path).exists(): + shell_cmd += ['/k', cmderrc_path] + if cwd: