User scripts should be called based on new $VIRTUALENVWRAPPER_ENV_BIN_DIR variable

greghaskins · greghaskins · commit 6d07a5120977 · 2011-06-15T16:17:24.000-04:00
diff --git a/virtualenvwrapper/user_scripts.py b/virtualenvwrapper/user_scripts.py
@@ -208,7 +208,7 @@ def post_activate_source(args):
 # Run user-provided scripts
 #
 [ -f "$VIRTUALENVWRAPPER_HOOK_DIR/postactivate" ] && source "$VIRTUALENVWRAPPER_HOOK_DIR/postactivate"
-[ -f "$VIRTUAL_ENV/bin/postactivate" ] && source "$VIRTUAL_ENV/bin/postactivate"
+[ -f "$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/postactivate" ] && source "$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/postactivate"
 """
 
 
@@ -218,7 +218,7 @@ def pre_deactivate_source(args):
 #
 # Run user-provided scripts
 #
-[ -f "$VIRTUAL_ENV/bin/predeactivate" ] && source "$VIRTUAL_ENV/bin/predeactivate"
+[ -f "$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/predeactivate" ] && source "$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/predeactivate"
 [ -f "$VIRTUALENVWRAPPER_HOOK_DIR/predeactivate" ] && source "$VIRTUALENVWRAPPER_HOOK_DIR/predeactivate"
 """
 

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ def post_activate_source(args):`
`208`	`208`	`# Run user-provided scripts`
`209`	`209`	`#`
`210`	`210`	`[ -f "$VIRTUALENVWRAPPER_HOOK_DIR/postactivate" ] && source "$VIRTUALENVWRAPPER_HOOK_DIR/postactivate"`
`211`		`-[ -f "$VIRTUAL_ENV/bin/postactivate" ] && source "$VIRTUAL_ENV/bin/postactivate"`
	`211`	`+[ -f "$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/postactivate" ] && source "$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/postactivate"`
`212`	`212`	`"""`
`213`	`213`
`214`	`214`
`@@ -218,7 +218,7 @@ def pre_deactivate_source(args):`
`218`	`218`	`#`
`219`	`219`	`# Run user-provided scripts`
`220`	`220`	`#`
`221`		`-[ -f "$VIRTUAL_ENV/bin/predeactivate" ] && source "$VIRTUAL_ENV/bin/predeactivate"`
	`221`	`+[ -f "$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/predeactivate" ] && source "$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/predeactivate"`
`222`	`222`	`[ -f "$VIRTUALENVWRAPPER_HOOK_DIR/predeactivate" ] && source "$VIRTUALENVWRAPPER_HOOK_DIR/predeactivate"`
`223`	`223`	`"""`
`224`	`224`