From 8adca338735f23112491af9262e62330ba0ca384 Mon Sep 17 00:00:00 2001 From: David Stein Date: Sun, 18 Oct 2015 01:46:57 -0700 Subject: [PATCH] escape string in __VIRTUAL_ENV__ path for bash Fixes issue pypa/virtualenv#53 in bash and shell by using the printf %q "shell quote" formatter, which escapes as appropriate for a given environment. Falls back to quoting some characters that universally need to be escaped. Fallback is needed because there are several printf implementations, not all of which are guaranteed to have the %q formatter (though bash always should). uncompressed diff here: https://github.com/davidbstein/virtualenv_decompressed_scripts/commit/0bc6629e24c3b424d50856182eb7e81baac8ff6f --- virtualenv.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/virtualenv.py b/virtualenv.py index dfa8f388c..0b4b9dd3d 100755 --- a/virtualenv.py +++ b/virtualenv.py @@ -1880,19 +1880,20 @@ def convert(s): ##file activate.sh ACTIVATE_SH = convert(""" -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 +72bSC+8yRd9hgr5xer5lcr40NVWt/gFBkHAF """) ##file activate.fish