Commits

Doug Hellmann committed 0af6687

escape dollar sign in regex to resolve #53

Comments (0)

Files changed (3)

 making it easier to work on more than one project at a time without
 introducing conflicts in their dependencies.
 
-What's New in 2.1
+What's New in 2.2.1
 =================
 
-The primary purpose of this release is a set of enhancements to
-support virtualenvwrapper.project_, a new extension to manage project
-work directories with templates.  2.1 also includes several smaller
-changes and bug fixes.
+Version 2.2.1 is a bug-fix release:
 
-- Add support for ksh.  Thanks to Doug Latornell for doing the
-  research on what needed to be changed.
-- Test import of virtualenvwrapper.hook_loader on startup and report
-  the error in a way that should help the user figure out how to fix
-  it (issue #33).
-- Update mkvirtualenv documentation to include the
-  fact that a new environment is activated immediately after it is
-  created (issue #30).
-- Added hooks around cpvirtualenv.
-- Made deactivation more robust, especially under ksh.
-- Use Python's ``tempfile`` module for creating temporary filenames
-  safely and portably.
-- Fix a problem with ``virtualenvwrapper_show_workon_options`` that
-  caused it to show ``*`` as the name of a virtualenv when no
-  environments had yet been created.
-- Change the hook loader so it can be told to run only a set of
-  named hooks.
-- Add support for listing the available hooks, to be used in help
-  output of commands like virtualenvwrapper.project's mkproject.
-- Fix mkvirtualenv -h option behavior.
-- Change logging so the $WORKON_HOME/hook.log file rotates after
-  10KiB.
-
-
+- Escape ``which`` calls to avoid aliases. (#46)
+- Integrate Manuel Kaufmann's patch to unset GREP_OPTIONS before
+  calling grep. (#51)
+- Escape ``$`` in regex to resolve #53.
 
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 
 .. _virtualenvwrapper: http://www.doughellmann.com/projects/virtualenvwrapper/
-
-.. _virtualenvwrapper.project: http://www.doughellmann.com/projects/virtualenvwrapper.project/

docs/en/history.rst

   - Escape ``which`` calls to avoid aliases. Resolves :bbissue:`46`.
   - Integrate Manuel Kaufmann's patch to unset GREP_OPTIONS before
     calling grep.  Resolves :bbissue:`51`.
+  - Escape ``$`` in regex to resolve :bbissue:`53`.
 
 2.2
 

virtualenvwrapper.sh

 # path might contain stuff to expand.
 # (it might be possible to do this in shell, but I don't know a
 # cross-shell-safe way of doing it -wolever)
-if echo "$WORKON_HOME" | (unset GREP_OPTIONS; egrep -e "([$~]|//)" >/dev/null)
+if echo "$WORKON_HOME" | (unset GREP_OPTIONS; egrep -e "([\$~]|//)" >/dev/null)
 then
     # This will normalize the path by:
     # - Removing extra slashes (e.g., when TMPDIR ends in a slash)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.