Anonymous avatar Anonymous committed 527500e

Better error checking for virtualenv activation in bin/run_in_env_wrapper.sh

Comments (0)

Files changed (1)

bin/run_in_env_wrapper.sh

 [ -z "$1" ] && echo "Usage: `basename $0` <command> [args...]" 1>&2 && exit 1
 
 # Set python environment
-[ -f $VIRTUAL_ENV/bin/activate ] && source $VIRTUAL_ENV/bin/activate
+if [ ! -z $VIRTUAL_ENV ]; then
+    if [ -f $VIRTUAL_ENV/bin/activate ]; then
+        source $VIRTUAL_ENV/bin/activate
+        if [ ! $? = 0 ]; then
+            echo "Error activating virtualenv $VIRTUAL_ENV" 1>&2 && exit 1
+        fi
+    else
+        echo "$VIRTUAL_ENV is not a valid virtualenv" 1>&2 && exit 1
+    fi
+fi
 
 # Load django-environments
 source $PROJECT_ROOT/bin/djenvlib
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.