Skip to content

Commit b4792af

Browse files
committed
escape dollar sign in regex to resolve #53
1 parent 8eea540 commit b4792af

File tree

3 files changed

+8
-32
lines changed

3 files changed

+8
-32
lines changed

announce.rst

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,16 @@ virtual environments and otherwise managing your development workflow,
77
making it easier to work on more than one project at a time without
88
introducing conflicts in their dependencies.
99

10-
What's New in 2.1
10+
What's New in 2.2.1
1111
=================
1212

13-
The primary purpose of this release is a set of enhancements to
14-
support virtualenvwrapper.project_, a new extension to manage project
15-
work directories with templates. 2.1 also includes several smaller
16-
changes and bug fixes.
17-
18-
- Add support for ksh. Thanks to Doug Latornell for doing the
19-
research on what needed to be changed.
20-
- Test import of virtualenvwrapper.hook_loader on startup and report
21-
the error in a way that should help the user figure out how to fix
22-
it (issue #33).
23-
- Update mkvirtualenv documentation to include the
24-
fact that a new environment is activated immediately after it is
25-
created (issue #30).
26-
- Added hooks around cpvirtualenv.
27-
- Made deactivation more robust, especially under ksh.
28-
- Use Python's ``tempfile`` module for creating temporary filenames
29-
safely and portably.
30-
- Fix a problem with ``virtualenvwrapper_show_workon_options`` that
31-
caused it to show ``*`` as the name of a virtualenv when no
32-
environments had yet been created.
33-
- Change the hook loader so it can be told to run only a set of
34-
named hooks.
35-
- Add support for listing the available hooks, to be used in help
36-
output of commands like virtualenvwrapper.project's mkproject.
37-
- Fix mkvirtualenv -h option behavior.
38-
- Change logging so the $WORKON_HOME/hook.log file rotates after
39-
10KiB.
40-
13+
Version 2.2.1 is a bug-fix release:
4114

15+
- Escape ``which`` calls to avoid aliases. (#46)
16+
- Integrate Manuel Kaufmann's patch to unset GREP_OPTIONS before
17+
calling grep. (#51)
18+
- Escape ``$`` in regex to resolve #53.
4219

4320
.. _virtualenv: http://pypi.python.org/pypi/virtualenv
4421

4522
.. _virtualenvwrapper: http://www.doughellmann.com/projects/virtualenvwrapper/
46-
47-
.. _virtualenvwrapper.project: http://www.doughellmann.com/projects/virtualenvwrapper.project/

docs/en/history.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Dev
77
- Escape ``which`` calls to avoid aliases. Resolves :bbissue:`46`.
88
- Integrate Manuel Kaufmann's patch to unset GREP_OPTIONS before
99
calling grep. Resolves :bbissue:`51`.
10+
- Escape ``$`` in regex to resolve :bbissue:`53`.
1011

1112
2.2
1213

virtualenvwrapper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fi
6868
# path might contain stuff to expand.
6969
# (it might be possible to do this in shell, but I don't know a
7070
# cross-shell-safe way of doing it -wolever)
71-
if echo "$WORKON_HOME" | (unset GREP_OPTIONS; egrep -e "([$~]|//)" >/dev/null)
71+
if echo "$WORKON_HOME" | (unset GREP_OPTIONS; egrep -e "([\$~]|//)" >/dev/null)
7272
then
7373
# This will normalize the path by:
7474
# - Removing extra slashes (e.g., when TMPDIR ends in a slash)

0 commit comments

Comments
 (0)