Skip to content

Commit 629d06d

Browse files
committed
Merged in mjbrooks/virtualenvwrapper (pull request #12)
use VIRTUALENVWRAPPER_ENV_BIN_DIR throughout
2 parents 041c411 + 16a3ee3 commit 629d06d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

virtualenvwrapper.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ function virtualenvwrapper_get_python_version {
746746
# VIRTUALENVWRAPPER_PYTHON because we're trying to determine the
747747
# version installed there so we can build up the path to the
748748
# site-packages directory.
749-
"$VIRTUAL_ENV/bin/python" -V 2>&1 | cut -f2 -d' ' | cut -f-2 -d.
749+
"$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/python" -V 2>&1 | cut -f2 -d' ' | cut -f-2 -d.
750750
}
751751

752752
# Prints the path to the site-packages directory for the current environment.
@@ -1171,7 +1171,7 @@ function mktmpenv {
11711171
echo "This is a temporary environment. It will be deleted when you run 'deactivate'." | tee "$VIRTUAL_ENV/README.tmpenv"
11721172

11731173
# Update the postdeactivate script
1174-
cat - >> "$VIRTUAL_ENV/bin/postdeactivate" <<EOF
1174+
cat - >> "$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/postdeactivate" <<EOF
11751175
if [ -f "$VIRTUAL_ENV/README.tmpenv" ]
11761176
then
11771177
echo "Removing temporary environment:" $(basename "$VIRTUAL_ENV")
@@ -1217,7 +1217,7 @@ function allvirtualenv {
12171217
echo "$d" | sed 's/./=/g'
12181218
# Activate the environment, but not with workon
12191219
# because we don't want to trigger any hooks.
1220-
(source "$WORKON_HOME/$d/bin/activate";
1220+
(source "$WORKON_HOME/$d/$VIRTUALENVWRAPPER_ENV_BIN_DIR/activate";
12211221
virtualenvwrapper_cd "$VIRTUAL_ENV";
12221222
"$@")
12231223
echo

0 commit comments

Comments
 (0)