Skip to content

Commit 764d891

Browse files
committed
incorporate patch from fredpalmer to escape grep calls (fixes #57)
1 parent 8fb218e commit 764d891

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

virtualenvwrapper.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ virtualenvwrapper_derive_workon_home() {
6262

6363
# If the path is relative, prefix it with $HOME
6464
# (note: for compatibility)
65-
if echo "$workon_home_dir" | (unset GREP_OPTIONS; grep -e '^[^/~]' > /dev/null)
65+
if echo "$workon_home_dir" | (unset GREP_OPTIONS; \grep -e '^[^/~]' > /dev/null)
6666
then
6767
workon_home_dir="$HOME/$WORKON_HOME"
6868
fi
@@ -71,7 +71,7 @@ virtualenvwrapper_derive_workon_home() {
7171
# path might contain stuff to expand.
7272
# (it might be possible to do this in shell, but I don't know a
7373
# cross-shell-safe way of doing it -wolever)
74-
if echo "$workon_home_dir" | (unset GREP_OPTIONS; egrep -e "([\$~]|//)" >/dev/null)
74+
if echo "$workon_home_dir" | (unset GREP_OPTIONS; \egrep -e "([\$~]|//)" >/dev/null)
7575
then
7676
# This will normalize the path by:
7777
# - Removing extra slashes (e.g., when TMPDIR ends in a slash)
@@ -149,7 +149,7 @@ virtualenvwrapper_initialize () {
149149

150150
# Verify that virtualenv is installed and visible
151151
virtualenvwrapper_verify_virtualenv () {
152-
typeset venv=$(\which virtualenv | (unset GREP_OPTIONS; grep -v "not found"))
152+
typeset venv=$(\which virtualenv | (unset GREP_OPTIONS; \grep -v "not found"))
153153
if [ "$venv" = "" ]
154154
then
155155
echo "ERROR: virtualenvwrapper could not find virtualenv in your path" >&2
@@ -233,7 +233,7 @@ virtualenvwrapper_show_workon_options () {
233233
# NOTE: DO NOT use ls here because colorized versions spew control characters
234234
# into the output list.
235235
# echo seems a little faster than find, even with -depth 3.
236-
(cd "$WORKON_HOME"; for f in */bin/activate; do echo $f; done) 2>/dev/null | sed 's|^\./||' | sed 's|/bin/activate||' | sort | (unset GREP_OPTIONS; egrep -v '^\*$')
236+
(cd "$WORKON_HOME"; for f in */bin/activate; do echo $f; done) 2>/dev/null | sed 's|^\./||' | sed 's|/bin/activate||' | sort | (unset GREP_OPTIONS; \egrep -v '^\*$')
237237
# (cd "$WORKON_HOME"; find -L . -depth 3 -path '*/bin/activate') | sed 's|^\./||' | sed 's|/bin/activate||' | sort
238238
}
239239

@@ -452,7 +452,7 @@ cpvirtualenv() {
452452
echo "Please specify target virtualenv"
453453
return 1
454454
fi
455-
if echo "$WORKON_HOME" | (unset GREP_OPTIONS; grep -e "/$" > /dev/null)
455+
if echo "$WORKON_HOME" | (unset GREP_OPTIONS; \grep -e "/$" > /dev/null)
456456
then
457457
typset env_home="$WORKON_HOME"
458458
else

0 commit comments

Comments
 (0)